Module Name: src
Committed By: martin
Date: Sat Nov 24 23:50:36 UTC 2018
Modified Files:
src/usr.sbin/mtree [netbsd-8]: create.c
Log Message:
Pull up following revision(s) (requested by sevan in ticket #1103):
usr.sbin/mtree/create.c: revision 1.76
Adjust test, we only want to return the structure member if the result
is not NULL.
Heads up by Sascha Wildner @ DragonFly BSD.
To generate a diff of this commit:
cvs rdiff -u -r1.73 -r1.73.16.1 src/usr.sbin/mtree/create.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.sbin/mtree/create.c
diff -u src/usr.sbin/mtree/create.c:1.73 src/usr.sbin/mtree/create.c:1.73.16.1
--- src/usr.sbin/mtree/create.c:1.73 Thu Apr 24 17:22:41 2014
+++ src/usr.sbin/mtree/create.c Sat Nov 24 23:50:36 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: create.c,v 1.73 2014/04/24 17:22:41 christos Exp $ */
+/* $NetBSD: create.c,v 1.73.16.1 2018/11/24 23:50:36 martin Exp $ */
/*-
* Copyright (c) 1989, 1993
@@ -38,7 +38,7 @@
#if 0
static char sccsid[] = "@(#)create.c 8.1 (Berkeley) 6/6/93";
#else
-__RCSID("$NetBSD: create.c,v 1.73 2014/04/24 17:22:41 christos Exp $");
+__RCSID("$NetBSD: create.c,v 1.73.16.1 2018/11/24 23:50:36 martin Exp $");
#endif
#endif /* not lint */
@@ -117,7 +117,7 @@ cwalk(FILE *fp)
host[sizeof(host) - 1] = '\0';
if ((user = getlogin()) == NULL) {
struct passwd *pw;
- user = (pw = getpwuid(getuid())) == NULL ? pw->pw_name :
+ user = (pw = getpwuid(getuid())) != NULL ? pw->pw_name :
"<unknown>";
}
