add "make help"

[oweals/busybox.git] / coreutils / id.c

diff --git a/coreutils/id.c b/coreutils/id.c
index 6360491688e46d7d90a84d5b511ff1c7cc55ed1d..28050ddf23a2c78b7b1a24bae7fcd4ca47b6d420 100644 (file)
--- a/coreutils/id.c
+++ b/coreutils/id.c
@@ -61,12 +61,11 @@ extern int id_main(int argc, char **argv)
        unsigned long flags;
        short status;
 
-       bb_opt_complementaly = "u~g:g~u";
+       bb_opt_complementally = "!u~g:g~u";
        flags = bb_getopt_ulflags(argc, argv, "rnug");
 
-       if ((flags & BB_GETOPT_ERROR)
        /* Don't allow -n -r -nr */
-       || (flags <= 3 && flags > 0) 
+       if ((flags <= 3 && flags > 0) 
        /* Don't allow more than one username */
        || (argc > optind + 1))
                bb_show_usage();
@@ -81,8 +80,8 @@ extern int id_main(int argc, char **argv)
        
        if(argv[optind]) {
                p=getpwnam(argv[optind]);
-               /* my_getpwnam is needed because it exits on failure */
-               uid = my_getpwnam(argv[optind]);
+               /* bb_xgetpwnam is needed because it exits on failure */
+               uid = bb_xgetpwnam(argv[optind]);
                gid = p->pw_gid;
                /* in this case PRINT_REAL is the same */ 
        }
@@ -90,8 +89,8 @@ extern int id_main(int argc, char **argv)
        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 ));
+                       /* bb_getpwuid and bb_getgrgid exit on failure so puts cannot segfault */
+                       puts((flags & JUST_USER) ? bb_getpwuid(NULL, uid, -1 ) : bb_getgrgid(NULL, gid, -1 ));
                } else {
                        bb_printf("%u\n",(flags & JUST_USER) ? uid : gid);
                }
@@ -100,11 +99,11 @@ extern int id_main(int argc, char **argv)
        }
 
        /* Print full info like GNU id */
-       /* my_getpwuid doesn't exit on failure here */
-       status=printf_full(uid, my_getpwuid(NULL, uid, 0), 'u');
+       /* bb_getpwuid doesn't exit on failure here */
+       status=printf_full(uid, bb_getpwuid(NULL, uid, 0), 'u');
        putchar(' ');
-       /* my_getgrgid doesn't exit on failure here */
-       status|=printf_full(gid, my_getgrgid(NULL, gid, 0), 'g');
+       /* bb_getgrgid doesn't exit on failure here */
+       status|=printf_full(gid, bb_getgrgid(NULL, gid, 0), 'g');
 
 #ifdef CONFIG_SELINUX
        if ( is_selinux_enabled() ) {