emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Converted option parsing to getopt() and made some minor formatting changes.

Browse Source
This commit is contained in:
Mark Whitley 2000-07-19 19:38:13 +00:00
parent 27a804246a
commit aa4f108338
2 changed files with 42 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
coreutils/id.c
View File

@ -33,28 +33,30 @@ extern int id_main(int argc, char **argv)
int no_user = 0, no_group = 0, print_real = 0; int no_user = 0, no_group = 0, print_real = 0;
char *cp, *user, *group; char *cp, *user, *group;
unsigned long gid; unsigned long gid;
int opt;
cp = user = group = NULL; cp = user = group = NULL;
argc--; argv++; while ((opt = getopt(argc, argv, "ugr")) > 0) {
switch (opt) {
while (argc > 0) { case 'u':
cp = *argv; no_group++;
if (*cp == '-') { break;
switch (*++cp) { case 'g':
case 'u': no_group = 1; break; no_user++;
case 'g': no_user = 1; break; break;
case 'r': print_real = 1; break; case 'r':
default: usage(id_usage); print_real++;
} break;
} else { default:
user = cp; usage(id_usage);
} }
argc--; argv++;
} }
if (no_user && no_group) usage(id_usage); if (no_user && no_group) usage(id_usage);
user = argv[optind];
if (user == NULL) { if (user == NULL) {
user = xmalloc(9); user = xmalloc(9);
group = xmalloc(9); group = xmalloc(9);
@ -71,12 +73,13 @@ extern int id_main(int argc, char **argv)
my_getgrgid(group, gid); my_getgrgid(group, gid);
} }
if (no_group) printf("%lu\n", my_getpwnam(user)); if (no_group)
else if (no_user) printf("%lu\n", my_getgrnam(group)); printf("%lu\n", my_getpwnam(user));
else if (no_user)
printf("%lu\n", my_getgrnam(group));
else else
printf("uid=%lu(%s) gid=%lu(%s)\n", printf("uid=%lu(%s) gid=%lu(%s)\n",
my_getpwnam(user), user, my_getgrnam(group), group); my_getpwnam(user), user, my_getgrnam(group), group);
return(0); return(0);
} }

39
id.c
View File

@ -33,28 +33,30 @@ extern int id_main(int argc, char **argv)
int no_user = 0, no_group = 0, print_real = 0; int no_user = 0, no_group = 0, print_real = 0;
char *cp, *user, *group; char *cp, *user, *group;
unsigned long gid; unsigned long gid;
int opt;
cp = user = group = NULL; cp = user = group = NULL;
argc--; argv++; while ((opt = getopt(argc, argv, "ugr")) > 0) {
switch (opt) {
while (argc > 0) { case 'u':
cp = *argv; no_group++;
if (*cp == '-') { break;
switch (*++cp) { case 'g':
case 'u': no_group = 1; break; no_user++;
case 'g': no_user = 1; break; break;
case 'r': print_real = 1; break; case 'r':
default: usage(id_usage); print_real++;
} break;
} else { default:
user = cp; usage(id_usage);
} }
argc--; argv++;
} }
if (no_user && no_group) usage(id_usage); if (no_user && no_group) usage(id_usage);
user = argv[optind];
if (user == NULL) { if (user == NULL) {
user = xmalloc(9); user = xmalloc(9);
group = xmalloc(9); group = xmalloc(9);
@ -71,12 +73,13 @@ extern int id_main(int argc, char **argv)
my_getgrgid(group, gid); my_getgrgid(group, gid);
} }
if (no_group) printf("%lu\n", my_getpwnam(user)); if (no_group)
else if (no_user) printf("%lu\n", my_getgrnam(group)); printf("%lu\n", my_getpwnam(user));
else if (no_user)
printf("%lu\n", my_getgrnam(group));
else else
printf("uid=%lu(%s) gid=%lu(%s)\n", printf("uid=%lu(%s) gid=%lu(%s)\n",
my_getpwnam(user), user, my_getgrnam(group), group); my_getpwnam(user), user, my_getgrnam(group), group);
return(0); return(0);
} }