safe_strtoXX interface proved to be a bit unconvenient.

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

diff --git a/coreutils/id.c b/coreutils/id.c
index 39a57c196e8ddc9c35ec6e43b419b0d8f7f1f723..66874a71e68b3fe243316411492c9cd37b44a20a 100644 (file)
--- a/coreutils/id.c
+++ b/coreutils/id.c
@@ -4,20 +4,7 @@
  *
  * Copyright (C) 2000 by Randolph Chung <tausq@debian.org>
  *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- *
+ * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
  */
 
 /* BB_AUDIT SUSv3 _NOT_ compliant -- option -G is not currently supported. */
@@ -26,7 +13,6 @@
  */
 
 #include "busybox.h"
-#include "pwd_.h"
 #include <stdio.h>
 #include <unistd.h>
 #include <sys/types.h>
@@ -43,17 +29,17 @@
 static short printf_full(unsigned int id, const char *arg, const char prefix)
 {
        const char *fmt = "%cid=%u";
-       short status=EXIT_FAILURE;
+       short status = EXIT_FAILURE;
 
-       if(arg) {
+       if (arg) {
                fmt = "%cid=%u(%s)";
-               status=EXIT_SUCCESS;
+               status = EXIT_SUCCESS;
        }
-       bb_printf(fmt, prefix, id, arg);
+       printf(fmt, prefix, id, arg);
        return status;
 }
 
-extern int id_main(int argc, char **argv)
+int id_main(int argc, char **argv)
 {
        struct passwd *p;
        uid_t uid;
@@ -63,8 +49,8 @@ extern int id_main(int argc, char **argv)
 
        /* Don't allow -n -r -nr -ug -rug -nug -rnug */
        /* Don't allow more than one username */
-       bb_opt_complementally = "?1:?:u--g:g--u:r?ug:n?ug";
-       flags = bb_getopt_ulflags(argc, argv, "rnug");
+       opt_complementary = "?1:?:u--g:g--u:r?ug:n?ug";
+       flags = getopt32(argc, argv, "rnug");
 
        /* This values could be overwritten later */
        uid = geteuid();
@@ -74,35 +60,35 @@ extern int id_main(int argc, char **argv)
                gid = getgid();
        }
 
-       if(argv[optind]) {
-               p=getpwnam(argv[optind]);
+       if (argv[optind]) {
+               p = 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 */
        }
 
-       if(flags & (JUST_GROUP | JUST_USER)) {
+       if (flags & (JUST_GROUP | JUST_USER)) {
                /* JUST_GROUP and JUST_USER are mutually exclusive */
-               if(flags & NAME_NOT_NUMBER) {
+               if (flags & NAME_NOT_NUMBER) {
                        /* 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);
+                       printf("%u\n", (flags & JUST_USER) ? uid : gid);
                }
                /* exit */
-               bb_fflush_stdout_and_exit(EXIT_SUCCESS);
+               fflush_stdout_and_exit(EXIT_SUCCESS);
        }
 
        /* Print full info like GNU id */
        /* bb_getpwuid doesn't exit on failure here */
-       status=printf_full(uid, bb_getpwuid(NULL, uid, 0), 'u');
+       status = printf_full(uid, bb_getpwuid(NULL, uid, 0), 'u');
        putchar(' ');
        /* bb_getgrgid doesn't exit on failure here */
-       status|=printf_full(gid, bb_getgrgid(NULL, gid, 0), 'g');
+       status |= printf_full(gid, bb_getgrgid(NULL, gid, 0), 'g');
 
 #ifdef CONFIG_SELINUX
-       if ( is_selinux_enabled() ) {
+       if (is_selinux_enabled()) {
                        security_context_t mysid;
                        char context[80];
                        int len = sizeof(context);
@@ -110,26 +96,16 @@ extern int id_main(int argc, char **argv)
                        getcon(&mysid);
                        context[0] = '\0';
                        if (mysid) {
-                                       len = strlen(mysid)+1;
-                                       safe_strncpy(context, mysid, len);
-                                       freecon(mysid);
-                       }else{
-                                       safe_strncpy(context, "unknown",8);
+                               len = strlen(mysid)+1;
+                               safe_strncpy(context, mysid, len);
+                               freecon(mysid);
+                       } else {
+                               safe_strncpy(context, "unknown", 8);
                        }
-               bb_printf(" context=%s", context);
+               printf(" context=%s", context);
        }
 #endif
 
        putchar('\n');
-       bb_fflush_stdout_and_exit(status);
+       fflush_stdout_and_exit(status);
 }
-
-/* END CODE */
-/*
-Local Variables:
-c-file-style: "linux"
-c-basic-offset: 4
-tab-width: 4
-End:
-*/
-