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

diff --git a/id.c b/id.c
index 16cf083e1..85b288c0c 100644
--- a/id.c
+++ b/id.c
@@ -2,7 +2,6 @@
 /*
  * Mini id implementation for busybox
  *
- *
  * Copyright (C) 2000 by Randolph Chung <tausq@debian.org>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -21,54 +20,46 @@
  *
  */
 
-#include "internal.h"
+#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>
 
-static const char id_usage[] =
-	"id [OPTIONS]... [USERNAME]\n"
-#ifndef BB_FEATURE_TRIVIAL_HELP
-	"\nPrint information for USERNAME or the current user\n\n"
-	"Options:\n"
-	"\t-g\tprints only the group ID\n"
-	"\t-u\tprints only the user ID\n"
-	"\t-r\tprints the real user ID instead of the effective ID (with -ug)\n\n"
-#endif
-	;
-
 extern int id_main(int argc, char **argv)
 {
 	int no_user = 0, no_group = 0, print_real = 0;
-	char *cp, *user, *group;
-	gid_t gid;
+	int name_not_number = 0;
+	char user[9], group[9];
+	long gid;
+	long pwnam, grnam;
+	int opt;
 	
-	cp = user = group = NULL;
+	gid = 0;
 
-	argc--; argv++;
-
-	while (argc > 0) {
-		cp = *argv;
-		if (*cp == '-') {
-			switch (*++cp) {
-			case 'u': no_group = 1; break;
-			case 'g': no_user = 1; break;
-			case 'r': print_real = 1; break;
-			default: usage(id_usage);
-			}
-		} else {
-			user = cp;			
+	while ((opt = getopt(argc, argv, "ugrn")) > 0) {
+		switch (opt) {
+			case 'u':
+				no_group++;
+				break;
+			case 'g':
+				no_user++;
+				break;
+			case 'r':
+				print_real++;
+				break;
+			case 'n':
+				name_not_number++;
+				break;
+			default:
+				show_usage();
 		}
-		argc--; argv++;
 	}
 
-	if (no_user && no_group) usage(id_usage);
+	if (no_user && no_group) show_usage();
 
-	if (user == NULL) {
-		user = xmalloc(9);
-		group = xmalloc(9);
+	if (argv[optind] == NULL) {
 		if (print_real) {
 			my_getpwuid(user, getuid());
 			my_getgrgid(group, getgid());
@@ -77,19 +68,29 @@ extern int id_main(int argc, char **argv)
 			my_getgrgid(group, getegid());
 		}
 	} else {
-		group = xmalloc(9);
+		strncpy(user, argv[optind], 8);
+		user[8] = '\0';
 	    gid = my_getpwnamegid(user);
 		my_getgrgid(group, gid);
 	}
 
-	if (no_group) printf("%u\n", my_getpwnam(user));
-	else if (no_user) printf("%u\n", my_getgrnam(group));
-	else
-		printf("uid=%u(%s) gid=%u(%s)\n",
-			   my_getpwnam(user), user, my_getgrnam(group), group);
-	
+	pwnam=my_getpwnam(user);
+	grnam=my_getgrnam(group);
 
-	exit(0);
+	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);
 }