projects
/
oweals
/
busybox.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Use an int to hold the result of fgetc (bug noted by David Kimdon).
[oweals/busybox.git]
/
coreutils
/
id.c
diff --git
a/coreutils/id.c
b/coreutils/id.c
index e91ac758570e7b3e4ef9ef042611507bb65d068e..85b288c0c2dc53d1717c2c9615450eac1099c694 100644
(file)
--- a/
coreutils/id.c
+++ b/
coreutils/id.c
@@
-53,11
+53,11
@@
extern int id_main(int argc, char **argv)
name_not_number++;
break;
default:
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) {
if (argv[optind] == NULL) {
if (print_real) {
@@
-76,18
+76,15
@@
extern int id_main(int argc, char **argv)
pwnam=my_getpwnam(user);
grnam=my_getgrnam(group);
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)
if (no_group) {
if(name_not_number && user)
- p
rintf("%s\n",
user);
+ p
uts(
user);
else
printf("%ld\n", pwnam);
} else if (no_user) {
if(name_not_number && group)
else
printf("%ld\n", pwnam);
} else if (no_user) {
if(name_not_number && group)
- p
rintf("%s\n",
group);
+ p
uts(
group);
else
printf("%ld\n", grnam);
} else {
else
printf("%ld\n", grnam);
} else {