* libmisc/myname.c: Avoid assignments in comparisons.

	* libmisc/myname.c: Avoid implicit conversion of pointers / chars
	to booleans.
	* libmisc/myname.c: Add brackets.

diff --git a/ChangeLog b/ChangeLog
index b6f6a365686f1de47e992aecc6a8759113c430a7..81581ea28843ba3e6327764d68a34c90793639cc 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2008-05-25  Nicolas François  <nicolas.francois@centraliens.net>
+
+       * libmisc/myname.c: Avoid assignments in comparisons.
+       * libmisc/myname.c: Avoid implicit conversion of pointers / chars
+       to booleans.
+       * libmisc/myname.c: Add brackets.
+
 2008-05-25  Nicolas François  <nicolas.francois@centraliens.net>
 
        * libmisc/utmp.c (checkutmp): Change picky argument's type to

diff --git a/libmisc/myname.c b/libmisc/myname.c
index ff6d17ba20bf84b545bfe5b57fe2fabca7c28765..23464172136ff5f90cc388cfcc95cd30b2ad7db4 100644 (file)
--- a/libmisc/myname.c
+++ b/libmisc/myname.c
@@ -57,8 +57,12 @@ struct passwd *get_my_pwent (void)
         * XXX - when running from su, will return the current user (not
         * the original user, like getlogin() does).  Does this matter?
         */
-       if (cp && *cp && (pw = xgetpwnam (cp)) && pw->pw_uid == ruid)
-               return pw;
+       if ((NULL !=cp) && ('\0' != *cp)) {
+               pw = xgetpwnam (cp);
+               if ((NULL != pw) && (pw->pw_uid == ruid)) {
+                       return pw;
+               }
+       }
 
        return xgetpwuid (ruid);
 }