X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=coreutils%2Fid.c;h=85b288c0c2dc53d1717c2c9615450eac1099c694;hb=741f40b58edf3644c6bc8e6863ee9ad681b21562;hp=59cfafa0a6019ca1a84b2a4657c21922f3c3b70d;hpb=c1b8f1224c8f1160155ff9294080a899364ad799;p=oweals%2Fbusybox.git diff --git a/coreutils/id.c b/coreutils/id.c index 59cfafa0a..85b288c0c 100644 --- a/coreutils/id.c +++ b/coreutils/id.c @@ -23,9 +23,8 @@ #include "busybox.h" #include #include -#include -#include #include +#include #include extern int id_main(int argc, char **argv) @@ -54,11 +53,11 @@ extern int id_main(int argc, char **argv) name_not_number++; break; default: - usage(id_usage); + show_usage(); } } - if (no_user && no_group) usage(id_usage); + if (no_user && no_group) show_usage(); if (argv[optind] == NULL) { if (print_real) { @@ -77,18 +76,15 @@ extern int id_main(int argc, char **argv) pwnam=my_getpwnam(user); grnam=my_getgrnam(group); - if (gid == -1 || pwnam==-1 || grnam==-1) { - error_msg_and_die("%s: No such user\n", user); - } if (no_group) { if(name_not_number && user) - printf("%s\n",user); + puts(user); else printf("%ld\n", pwnam); } else if (no_user) { if(name_not_number && group) - printf("%s\n", group); + puts(group); else printf("%ld\n", grnam); } else {