use bb_xbind/bb_xlisten

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

diff --git a/coreutils/id.c b/coreutils/id.c
index 14497b416558c0b05faf77e600a4fb93c4637720..1bedff37aad5754ab8ac7e62d42928521649b412 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. */
@@ -53,7 +40,7 @@ static short printf_full(unsigned int id, const char *arg, const char prefix)
        return status;
 }
 
-extern int id_main(int argc, char **argv)
+int id_main(int argc, char **argv)
 {
        struct passwd *p;
        uid_t uid;
@@ -62,12 +49,9 @@ extern int id_main(int argc, char **argv)
        short status;
 
        /* Don't allow -n -r -nr -ug -rug -nug -rnug */
-       bb_opt_complementally = "?u~g:g~u:r?ug:n?ug";
-       flags = bb_getopt_ulflags(argc, argv, "rnug");
-
        /* Don't allow more than one username */
-       if (argc > (optind + 1))
-               bb_show_usage();
+       bb_opt_complementally = "?1:?:u--g:g--u:r?ug:n?ug";
+       flags = bb_getopt_ulflags(argc, argv, "rnug");
 
        /* This values could be overwritten later */
        uid = geteuid();
@@ -126,13 +110,3 @@ extern int id_main(int argc, char **argv)
        putchar('\n');
        bb_fflush_stdout_and_exit(status);
 }
-
-/* END CODE */
-/*
-Local Variables:
-c-file-style: "linux"
-c-basic-offset: 4
-tab-width: 4
-End:
-*/
-