Applied patch from Larry Doolittle to fix '>\na\n' bug. Should close bug #1132

[oweals/busybox.git] / id.c

diff --git a/id.c b/id.c
index 4c524a22534cf41e581d7142f7055e299eec93d2..3f90d55f63b2321043e729c68721b390841ab309 100644 (file)
--- 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,23 +20,25 @@
  *
  */
 
-#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>
 
 extern int id_main(int argc, char **argv)
 {
        int no_user = 0, no_group = 0, print_real = 0;
-       char *cp, *user, *group;
-       unsigned long gid;
+       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++;
@@ -48,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 = xmalloc(9);
-               group = xmalloc(9);
+       if (argv[optind] == NULL) {
                if (print_real) {
                        my_getpwuid(user, getuid());
                        my_getgrgid(group, getgid());
@@ -68,19 +68,28 @@ 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("%lu\n", my_getpwnam(user));
-       else if (no_user)
-               printf("%lu\n", my_getgrnam(group));
-       else
-               printf("uid=%lu(%s) gid=%lu(%s)\n",
-                               my_getpwnam(user), user, my_getgrnam(group), group);
+       pwnam=my_getpwnam(user);
+       grnam=my_getgrnam(group);
 
+       if (no_group) {
+               if(name_not_number && user)
+                       printf("%s\n",user);
+               else
+                       printf("%ld\n", pwnam);
+       } else if (no_user) {
+               if(name_not_number && group)
+                       printf("%s\n", group);
+               else
+                       printf("%ld\n", grnam);
+       } else {
+               printf("uid=%ld(%s) gid=%ld(%s)\n", pwnam, user, grnam, group);
+       }
        return(0);
 }