X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=id.c;h=85b288c0c2dc53d1717c2c9615450eac1099c694;hb=51ded05b3bf4df6f126420d39a40d27ea0728aa9;hp=86667f516d463862a87bdc015c0141401caebd09;hpb=f57c944e09417edcbcd69f2b01b937cadef39db2;p=oweals%2Fbusybox.git

diff --git a/id.c b/id.c
index 86667f516..85b288c0c 100644
--- a/id.c
+++ b/id.c
@@ -23,23 +23,22 @@
 #include "busybox.h"
 #include <stdio.h>
 #include <unistd.h>
-#include <pwd.h>
-#include <grp.h>
 #include <getopt.h>
+#include <string.h>
 #include <sys/types.h>
 
 extern int id_main(int argc, char **argv)
 {
 	int no_user = 0, no_group = 0, print_real = 0;
-	char *cp, *user, *group;
+	int name_not_number = 0;
+	char user[9], group[9];
 	long gid;
 	long pwnam, grnam;
 	int opt;
 	
-	cp = user = group = NULL;
 	gid = 0;
 
-	while ((opt = getopt(argc, argv, "ugr")) > 0) {
+	while ((opt = getopt(argc, argv, "ugrn")) > 0) {
 		switch (opt) {
 			case 'u':
 				no_group++;
@@ -50,18 +49,17 @@ extern int id_main(int argc, char **argv)
 			case 'r':
 				print_real++;
 				break;
+			case 'n':
+				name_not_number++;
+				break;
 			default:
-				usage(id_usage);
+				show_usage();
 		}
 	}
 
-	if (no_user && no_group) usage(id_usage);
-
-	user = argv[optind];
+	if (no_user && no_group) show_usage();
 
-	if (user == NULL) {
-		user = xcalloc(9, sizeof(char));
-		group = xcalloc(9, sizeof(char));
+	if (argv[optind] == NULL) {
 		if (print_real) {
 			my_getpwuid(user, getuid());
 			my_getgrgid(group, getgid());
@@ -70,22 +68,28 @@ extern int id_main(int argc, char **argv)
 			my_getgrgid(group, getegid());
 		}
 	} else {
-		group = xcalloc(9, sizeof(char));
+		strncpy(user, argv[optind], 8);
+		user[8] = '\0';
 	    gid = my_getpwnamegid(user);
 		my_getgrgid(group, gid);
 	}
 
 	pwnam=my_getpwnam(user);
 	grnam=my_getgrnam(group);
-	if (gid == -1 || pwnam==-1 || grnam==-1) {
-		error_msg_and_die("%s: No such user\n", user);
-	}
-	if (no_group)
-		printf("%ld\n", pwnam);
-	else if (no_user)
-		printf("%ld\n", grnam);
-	else
+
+	if (no_group) {
+		if(name_not_number && user)
+			puts(user);
+		else
+			printf("%ld\n", pwnam);
+	} else if (no_user) {
+		if(name_not_number && group)
+			puts(group);
+		else
+			printf("%ld\n", grnam);
+	} else {
 		printf("uid=%ld(%s) gid=%ld(%s)\n", pwnam, user, grnam, group);
+	}
 	return(0);
 }