[src/netbsd-7]: src/usr.sbin/mtree Pull up following revision(s) (requested b...

[martin <martin%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/da71a7a58a4d
branches:  netbsd-7
changeset: 446136:da71a7a58a4d
user:      martin <martin%NetBSD.org@localhost>
date:      Sat Nov 24 16:59:11 2018 +0000

description:
Pull up following revision(s) (requested by sevan in ticket #1654):

        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.
Adjust test, we only want to return the structure member if the result
is not NULL.

diffstat:

 usr.sbin/mtree/create.c |  6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diffs (27 lines):

diff -r 709321eb6171 -r da71a7a58a4d usr.sbin/mtree/create.c
--- a/usr.sbin/mtree/create.c   Wed Nov 21 12:12:44 2018 +0000
+++ b/usr.sbin/mtree/create.c   Sat Nov 24 16:59:11 2018 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: create.c,v 1.73 2014/04/24 17:22:41 christos Exp $     */
+/*     $NetBSD: create.c,v 1.73.2.1 2018/11/24 16:59:11 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.2.1 2018/11/24 16:59:11 martin Exp $");
 #endif
 #endif /* not lint */
 
@@ -117,7 +117,7 @@
        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>";
        }