summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog3
-rw-r--r--misc.c4
2 files changed, 5 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 4864be92f..413adfec0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,9 @@
5 - tedu@cvs.openbsd.org 2013/04/23 17:49:45 5 - tedu@cvs.openbsd.org 2013/04/23 17:49:45
6 [misc.c] 6 [misc.c]
7 use xasprintf instead of a series of strlcats and strdup. ok djm 7 use xasprintf instead of a series of strlcats and strdup. ok djm
8 - tedu@cvs.openbsd.org 2013/04/24 16:01:46
9 [misc.c]
10 remove extra parens noticed by nicm
8 11
920130510 1220130510
10 - (dtucker) [configure.ac] Enable -Wsizeof-pointer-memaccess if the compiler 13 - (dtucker) [configure.ac] Enable -Wsizeof-pointer-memaccess if the compiler
diff --git a/misc.c b/misc.c
index ee5711d19..77f4a37a1 100644
--- a/misc.c
+++ b/misc.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: misc.c,v 1.87 2013/04/23 17:49:45 tedu Exp $ */ 1/* $OpenBSD: misc.c,v 1.88 2013/04/24 16:01:46 tedu Exp $ */
2/* 2/*
3 * Copyright (c) 2000 Markus Friedl. All rights reserved. 3 * Copyright (c) 2000 Markus Friedl. All rights reserved.
4 * Copyright (c) 2005,2006 Damien Miller. All rights reserved. 4 * Copyright (c) 2005,2006 Damien Miller. All rights reserved.
@@ -540,7 +540,7 @@ tilde_expand_filename(const char *filename, uid_t uid)
540 540
541 /* Make sure directory has a trailing '/' */ 541 /* Make sure directory has a trailing '/' */
542 len = strlen(pw->pw_dir); 542 len = strlen(pw->pw_dir);
543 if ((len == 0 || pw->pw_dir[len - 1] != '/')) 543 if (len == 0 || pw->pw_dir[len - 1] != '/')
544 sep = "/"; 544 sep = "/";
545 else 545 else
546 sep = ""; 546 sep = "";