[BusyBox] [PATCH RESEND 2] id.c fixes and code cleanup

[Tito]

On Saturday 11 September 2004 OO:22, Tito wrote:
> Hi Erik,
> Hi to all
> This patch fixes all the exceptions for id spotted by vodz
> in our long thread.
> The binary size is about the same as before,
> but now the it should work as expected.
> root at localhost:/dev/pts/1:/root/Desktop/busybox# size coreutils/id.o.cvs
>    text    data     bss     dec     hex filename
>     388       0       0     388     184 coreutils/id.o.cvs
> root at localhost:/dev/pts/1:/root/Desktop/busybox# size coreutils/id.o
>    text    data     bss     dec     hex filename
>     386       0       0     386     182 coreutils/id.o
> The patch conyains also some formatting fixes and a clean up for my_getpwuid and my_getgrgid.
> 
> Please apply.
> 
> Thanks in advance,
> Ciao,
> Tito
> 
Just one more fix for an incorrect exit code.
Before vodz "the terrible" spots it ;-)

Test case:
chown 777.0 busybox
chmod 7655 busybox
./busybox id
uid=777 gid=0(root)
echo $?
0

should be 1.

Hope this is the last fix.
Score now is:
   text    data     bss     dec     hex filename
    393       0       0     393     189 coreutils/id.o tito :-P
   text    data     bss     dec     hex filename
    394       0       0     394     18a id.o               vodz

Please apply.
Ciao,
Tito
-------------- next part --------------
--- libbb/my_getpwuid_orig.c	2004-09-02 22:21:40.000000000 +0000
+++ libbb/my_getpwuid.c	2004-09-03 23:19:56.306987136 +0000
@@ -38,7 +38,6 @@
 #include <assert.h>
 #include "libbb.h"
 #include "pwd_.h"
-#include "grp_.h"
 
 
 
@@ -58,8 +57,7 @@
 		}
 		return NULL;
 	} else {
-		if(bufsize > 0 )
-		{
+		if(bufsize > 0 ) {
 			assert(name != NULL);
 			return safe_strncpy(name, myuser->pw_name, bufsize);
 		}
--- libbb/my_getgrgid_orig.c	2004-09-02 22:21:40.000000000 +0000
+++ libbb/my_getgrgid.c	2004-09-03 23:19:43.351956600 +0000
@@ -37,7 +37,6 @@
 #include <string.h>
 #include <assert.h>
 #include "libbb.h"
-#include "pwd_.h"
 #include "grp_.h"
 
 
@@ -57,8 +56,7 @@
 		} 
 		return NULL;
 	} else {
-		if(bufsize > 0)
-		{
+		if(bufsize > 0) {
 			assert(group != NULL);
 			return safe_strncpy(group, mygroup->gr_name, bufsize);
 		}
--- coreutils/id_cvs.c	2004-09-06 22:34:45.000000000 +0000
+++ coreutils/id.c	2004-09-12 17:00:35.000000000 +0000
@@ -26,12 +26,9 @@
  */
 
 #include "busybox.h"
-#include "grp_.h"
 #include "pwd_.h"
 #include <stdio.h>
 #include <unistd.h>
-#include <getopt.h>
-#include <string.h>
 #include <sys/types.h>
 
 #ifdef CONFIG_SELINUX
@@ -44,21 +41,26 @@
 #define JUST_USER         4
 #define JUST_GROUP        8
 
-void printf_full(unsigned int id, char *arg, char prefix)
+static short printf_full(unsigned int id, const char *arg, const char prefix)
 {	
-	printf("%cid=%u",prefix, id);
-	if(arg)
-		printf("(%s) ", arg);
+	const char *fmt = "%cid=%u";
+	short status=EXIT_FAILURE;
+	
+	if(arg) {
+		fmt = "%cid=%u(%s)";
+		status=EXIT_SUCCESS;
+	}
+	bb_printf(fmt, prefix, id, arg);
+	return status;
 }
 
 extern int id_main(int argc, char **argv)
 {
 	struct passwd *p;
-	char *user;
-	char *group;
 	uid_t uid;
 	gid_t gid;
-	int flags;
+	unsigned long flags;
+	short status;
 #ifdef CONFIG_SELINUX
 	int is_flask_enabled_flag = is_flask_enabled();
 #endif
@@ -67,8 +69,9 @@
 	flags = bb_getopt_ulflags(argc, argv, "rnug");
 
 	if ((flags & 0x80000000UL)
-	 /* Don't allow -n -r -nr */
+	/* Don't allow -n -r -nr */
 	|| (flags <= 3 && flags > 0) 
+	/* Don't allow more than one username */
 	|| (argc > optind + 1))
 		bb_show_usage();
 	
@@ -80,54 +83,45 @@
 		gid = getgid();
 	}
 	
-	if(argv[optind])
-	{
-
+	if(argv[optind]) {
 		p=getpwnam(argv[optind]);
-		/* this is needed because it exits on failure */
+		/* my_getpwnam is needed because it exits on failure */
 		uid = my_getpwnam(argv[optind]);
 		gid = p->pw_gid;
 		/* in this case PRINT_REAL is the same */ 
 	}
-	
-	user=my_getpwuid(NULL, uid, (flags & JUST_USER) ? -1 : 0);
 
-	if(flags & JUST_USER)
-	{
-		gid=uid;
-		group=user;
-		goto PRINT; 
-	}
-	
-	group=my_getgrgid(NULL, gid, (flags & JUST_GROUP) ? -1 : 0);
-
-	if(flags & JUST_GROUP) 
-	{
-PRINT:		
-		if(flags & NAME_NOT_NUMBER)
-			puts(group);
-		else
-			printf ("%u\n", gid);
+	if(flags & (JUST_GROUP | JUST_USER)) {
+		/* JUST_GROUP and JUST_USER are mutually exclusive */
+		if(flags & NAME_NOT_NUMBER) {
+			/* my_getpwuid and my_getgrgid exit on failure so puts cannot segfault */
+			puts((flags & JUST_USER) ? my_getpwuid(NULL, uid, -1 ) : my_getgrgid(NULL, gid, -1 ));
+		} else {
+			bb_printf("%u\n",(flags & JUST_USER) ? uid : gid);
+		}
+		/* exit */ 
 		bb_fflush_stdout_and_exit(EXIT_SUCCESS);
 	}
-	
+
 	/* Print full info like GNU id */
-	printf_full(uid, user, 'u');
-	printf_full(gid, group, 'g');
+	/* my_getpwuid doesn't exit on failure here */
+	status=printf_full(uid, my_getpwuid(NULL, uid, 0), 'u');
+	putchar(' ');
+	/* my_getgrgid doesn't exit on failure here */
+	status|=printf_full(gid, my_getgrgid(NULL, gid, 0), 'g');
 #ifdef CONFIG_SELINUX
-	if(is_flask_enabled_flag)
-	{
+	if(is_flask_enabled_flag) {
 		security_id_t mysid = getsecsid();
 		char context[80];
 		int len = sizeof(context);
 		context[0] = '\0';
 		if(security_sid_to_context(mysid, context, &len))
 			strcpy(context, "unknown");
-		printf("context=%s", context);
+		bb_printf(" context=%s", context);
 	}
 #endif
-	puts("");
-	bb_fflush_stdout_and_exit((user && group) ? EXIT_SUCCESS : EXIT_FAILURE);
+	putchar('\n');
+	bb_fflush_stdout_and_exit(status);
 }
 
 /* END CODE */