summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEric Andersen2001-01-25 05:12:02 +0000
committerEric Andersen2001-01-25 05:12:02 +0000
commitc1b8f1224c8f1160155ff9294080a899364ad799 (patch)
tree092433d84f312e08b8eb118b26b4fd02558eeca4
parent155c89b0c3aa0e86c630bccc0af4143223b49121 (diff)
downloadbusybox-c1b8f1224c8f1160155ff9294080a899364ad799.zip
busybox-c1b8f1224c8f1160155ff9294080a899364ad799.tar.gz
Apply a patch from Brent Priddy <brent.priddy@adtran.com> to add
'id -n' support. -Erik
-rw-r--r--applets/usage.c1
-rw-r--r--coreutils/id.c24
-rw-r--r--docs/busybox.pod3
-rw-r--r--docs/busybox.sgml1
-rw-r--r--id.c24
-rw-r--r--usage.c1
6 files changed, 41 insertions, 13 deletions
diff --git a/applets/usage.c b/applets/usage.c
index a9862fd..534958e 100644
--- a/applets/usage.c
+++ b/applets/usage.c
@@ -532,6 +532,7 @@ const char id_usage[] =
"Options:\n"
"\t-g\tprints only the group ID\n"
"\t-u\tprints only the user ID\n"
+ "\t-n\tprint a name instead of a number (with for -ug)\n"
"\t-r\tprints the real user ID instead of the effective ID (with -ug)"
#endif
;
diff --git a/coreutils/id.c b/coreutils/id.c
index 3a8e77a..59cfafa 100644
--- a/coreutils/id.c
+++ b/coreutils/id.c
@@ -31,6 +31,7 @@
extern int id_main(int argc, char **argv)
{
int no_user = 0, no_group = 0, print_real = 0;
+ int name_not_number = 0;
char user[9], group[9];
long gid;
long pwnam, grnam;
@@ -38,7 +39,7 @@ extern int id_main(int argc, char **argv)
gid = 0;
- while ((opt = getopt(argc, argv, "ugr")) > 0) {
+ while ((opt = getopt(argc, argv, "ugrn")) > 0) {
switch (opt) {
case 'u':
no_group++;
@@ -49,6 +50,9 @@ extern int id_main(int argc, char **argv)
case 'r':
print_real++;
break;
+ case 'n':
+ name_not_number++;
+ break;
default:
usage(id_usage);
}
@@ -76,12 +80,20 @@ extern int id_main(int argc, char **argv)
if (gid == -1 || pwnam==-1 || grnam==-1) {
error_msg_and_die("%s: No such user\n", user);
}
- if (no_group)
- printf("%ld\n", pwnam);
- else if (no_user)
- printf("%ld\n", grnam);
- else
+
+ if (no_group) {
+ if(name_not_number && user)
+ printf("%s\n",user);
+ else
+ printf("%ld\n", pwnam);
+ } else if (no_user) {
+ if(name_not_number && group)
+ printf("%s\n", group);
+ else
+ printf("%ld\n", grnam);
+ } else {
printf("uid=%ld(%s) gid=%ld(%s)\n", pwnam, user, grnam, group);
+ }
return(0);
}
diff --git a/docs/busybox.pod b/docs/busybox.pod
index ba88bee..e3da284 100644
--- a/docs/busybox.pod
+++ b/docs/busybox.pod
@@ -871,6 +871,7 @@ Options:
-g prints only the group ID
-u prints only the user ID
+ -n print a name instead of a number (with for -ug)
-r prints the real user ID instead of the effective ID (with -ug)
Example:
@@ -2321,4 +2322,4 @@ Enrique Zanardi <ezanardi@ull.es>
=cut
-# $Id: busybox.pod,v 1.87 2001/01/24 19:15:07 andersen Exp $
+# $Id: busybox.pod,v 1.88 2001/01/25 05:12:02 andersen Exp $
diff --git a/docs/busybox.sgml b/docs/busybox.sgml
index 8b77c51..58d7df8 100644
--- a/docs/busybox.sgml
+++ b/docs/busybox.sgml
@@ -1474,6 +1474,7 @@
<screen>
-g Print only the group ID
-u Print only the user ID
+ -n print a name instead of a number (with for -ug)
-r Print the real user ID instead of the effective ID (with -ug)
</screen>
</para>
diff --git a/id.c b/id.c
index 3a8e77a..59cfafa 100644
--- a/id.c
+++ b/id.c
@@ -31,6 +31,7 @@
extern int id_main(int argc, char **argv)
{
int no_user = 0, no_group = 0, print_real = 0;
+ int name_not_number = 0;
char user[9], group[9];
long gid;
long pwnam, grnam;
@@ -38,7 +39,7 @@ extern int id_main(int argc, char **argv)
gid = 0;
- while ((opt = getopt(argc, argv, "ugr")) > 0) {
+ while ((opt = getopt(argc, argv, "ugrn")) > 0) {
switch (opt) {
case 'u':
no_group++;
@@ -49,6 +50,9 @@ extern int id_main(int argc, char **argv)
case 'r':
print_real++;
break;
+ case 'n':
+ name_not_number++;
+ break;
default:
usage(id_usage);
}
@@ -76,12 +80,20 @@ extern int id_main(int argc, char **argv)
if (gid == -1 || pwnam==-1 || grnam==-1) {
error_msg_and_die("%s: No such user\n", user);
}
- if (no_group)
- printf("%ld\n", pwnam);
- else if (no_user)
- printf("%ld\n", grnam);
- else
+
+ if (no_group) {
+ if(name_not_number && user)
+ printf("%s\n",user);
+ else
+ printf("%ld\n", pwnam);
+ } else if (no_user) {
+ if(name_not_number && group)
+ printf("%s\n", group);
+ else
+ printf("%ld\n", grnam);
+ } else {
printf("uid=%ld(%s) gid=%ld(%s)\n", pwnam, user, grnam, group);
+ }
return(0);
}
diff --git a/usage.c b/usage.c
index a9862fd..534958e 100644
--- a/usage.c
+++ b/usage.c
@@ -532,6 +532,7 @@ const char id_usage[] =
"Options:\n"
"\t-g\tprints only the group ID\n"
"\t-u\tprints only the user ID\n"
+ "\t-n\tprint a name instead of a number (with for -ug)\n"
"\t-r\tprints the real user ID instead of the effective ID (with -ug)"
#endif
;