svn commit: trunk/busybox: miscutils util-linux

vda at busybox.net vda at busybox.net
Thu Sep 27 10:17:53 UTC 2007


Author: vda
Date: 2007-09-27 03:17:53 -0700 (Thu, 27 Sep 2007)
New Revision: 20061

Log:
style and message text fixes



Modified:
   trunk/busybox/miscutils/crontab.c
   trunk/busybox/util-linux/ipcs.c


Changeset:
Modified: trunk/busybox/miscutils/crontab.c
===================================================================
--- trunk/busybox/miscutils/crontab.c	2007-09-27 10:17:16 UTC (rev 20060)
+++ trunk/busybox/miscutils/crontab.c	2007-09-27 10:17:53 UTC (rev 20061)
@@ -324,7 +324,7 @@
 
 	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);

Modified: trunk/busybox/util-linux/ipcs.c
===================================================================
--- trunk/busybox/util-linux/ipcs.c	2007-09-27 10:17:16 UTC (rev 20060)
+++ trunk/busybox/util-linux/ipcs.c	2007-09-27 10:17:53 UTC (rev 20061)
@@ -99,23 +99,19 @@
 
 	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);
+	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);
 
-	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->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);
 }
 
 




More information about the busybox-cvs mailing list