style and message text fixes
authorvda <vda@69ca8d6d-28ef-0310-b511-8ec308f3f277>
Thu, 27 Sep 2007 10:17:53 +0000 (10:17 +0000)
committervda <vda@69ca8d6d-28ef-0310-b511-8ec308f3f277>
Thu, 27 Sep 2007 10:17:53 +0000 (10:17 +0000)
git-svn-id: svn://busybox.net/trunk/busybox@20061 69ca8d6d-28ef-0310-b511-8ec308f3f277

miscutils/crontab.c
util-linux/ipcs.c

index 69f2e31..1b827d7 100644 (file)
@@ -324,7 +324,7 @@ static int ChangeUser(const char *user, short dochdir)
 
        pas = getpwnam(user);
        if (pas == NULL) {
-               bb_perror_msg_and_die("failed to get uid for %s", user);
+               bb_perror_msg_and_die("cannot get uid for %s", user);
        }
        setenv("USER", pas->pw_name, 1);
        setenv("HOME", pas->pw_dir, 1);
index e11c2de..0b4dbf6 100644 (file)
@@ -99,23 +99,19 @@ static void print_perms(int id, struct ipc_perm *ipcp)
 
        printf("%-10d %-10o", id, ipcp->mode & 0777);
 
-       if ((pw = getpwuid(ipcp->cuid)))
-               printf(" %-10s", pw->pw_name);
-       else
-               printf(" %-10d", ipcp->cuid);
-       if ((gr = getgrgid(ipcp->cgid)))
-               printf(" %-10s", gr->gr_name);
-       else
-               printf(" %-10d", ipcp->cgid);
-
-       if ((pw = getpwuid(ipcp->uid)))
-               printf(" %-10s", pw->pw_name);
-       else
-               printf(" %-10d", ipcp->uid);
-       if ((gr = getgrgid(ipcp->gid)))
-               printf(" %-10s\n", gr->gr_name);
-       else
-               printf(" %-10d\n", ipcp->gid);
+       pw = getpwuid(ipcp->cuid);
+       if (pw) printf(" %-10s", pw->pw_name);
+       else    printf(" %-10d", ipcp->cuid);
+       gr = getgrgid(ipcp->cgid);
+       if (gr) printf(" %-10s", gr->gr_name);
+       else    printf(" %-10d", ipcp->cgid);
+
+       pw = getpwuid(ipcp->uid);
+       if (pw) printf(" %-10s", pw->pw_name);
+       else    printf(" %-10d", ipcp->uid);
+       gr = getgrgid(ipcp->gid);
+       if (gr) printf(" %-10s\n", gr->gr_name);
+       else    printf(" %-10d\n", ipcp->gid);
 }