summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog8
-rw-r--r--tildexpand.c5
2 files changed, 10 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index f3ca7c91f..93bef7c3b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
120020624
2 - OpenBSD CVS Sync
3 - deraadt@cvs.openbsd.org 2002/06/23 03:25:50
4 [tildexpand.c]
5 KNF
6
120020623 720020623
2 - (stevesk) [configure.ac] bug #255 LOGIN_NEEDS_UTMPX for AIX. 8 - (stevesk) [configure.ac] bug #255 LOGIN_NEEDS_UTMPX for AIX.
3 - (bal) removed GNUism for getops in ssh-agent since glibc lacks optreset. 9 - (bal) removed GNUism for getops in ssh-agent since glibc lacks optreset.
@@ -1041,4 +1047,4 @@
1041 - (stevesk) entropy.c: typo in debug message 1047 - (stevesk) entropy.c: typo in debug message
1042 - (djm) ssh-keygen -i needs seeded RNG; report from markus@ 1048 - (djm) ssh-keygen -i needs seeded RNG; report from markus@
1043 1049
1044$Id: ChangeLog,v 1.2253 2002/06/23 00:38:24 mouring Exp $ 1050$Id: ChangeLog,v 1.2254 2002/06/23 21:20:34 mouring Exp $
diff --git a/tildexpand.c b/tildexpand.c
index e89a7ade8..cbe981146 100644
--- a/tildexpand.c
+++ b/tildexpand.c
@@ -11,7 +11,7 @@
11 */ 11 */
12 12
13#include "includes.h" 13#include "includes.h"
14RCSID("$OpenBSD: tildexpand.c,v 1.12 2001/08/11 22:51:27 jakob Exp $"); 14RCSID("$OpenBSD: tildexpand.c,v 1.13 2002/06/23 03:25:50 deraadt Exp $");
15 15
16#include "xmalloc.h" 16#include "xmalloc.h"
17#include "log.h" 17#include "log.h"
@@ -67,6 +67,7 @@ tilde_expand_filename(const char *filename, uid_t my_uid)
67 if (len > MAXPATHLEN) 67 if (len > MAXPATHLEN)
68 fatal("Home directory too long (%d > %d", len-1, MAXPATHLEN-1); 68 fatal("Home directory too long (%d > %d", len-1, MAXPATHLEN-1);
69 expanded = xmalloc(len); 69 expanded = xmalloc(len);
70 snprintf(expanded, len, "%s%s%s", pw->pw_dir, strcmp(pw->pw_dir, "/") ? "/" : "", cp + 1); 70 snprintf(expanded, len, "%s%s%s", pw->pw_dir,
71 strcmp(pw->pw_dir, "/") ? "/" : "", cp + 1);
71 return expanded; 72 return expanded;
72} 73}