*
*/
-#include "internal.h"
+#include "busybox.h"
#include <stdio.h>
#include <unistd.h>
-#include <pwd.h>
-#include <grp.h>
#include <getopt.h>
+#include <string.h>
#include <sys/types.h>
extern int id_main(int argc, char **argv)
{
int no_user = 0, no_group = 0, print_real = 0;
- char *cp, *user, *group;
+ int name_not_number = 0;
+ char user[9], group[9];
long gid;
long pwnam, grnam;
int opt;
- cp = user = group = NULL;
+ gid = 0;
- while ((opt = getopt(argc, argv, "ugr")) > 0) {
+ while ((opt = getopt(argc, argv, "ugrn")) > 0) {
switch (opt) {
case 'u':
no_group++;
case 'r':
print_real++;
break;
+ case 'n':
+ name_not_number++;
+ break;
default:
usage(id_usage);
}
if (no_user && no_group) usage(id_usage);
- user = argv[optind];
-
- if (user == NULL) {
- user = xcalloc(9, sizeof(char));
- group = xcalloc(9, sizeof(char));
+ if (argv[optind] == NULL) {
if (print_real) {
my_getpwuid(user, getuid());
my_getgrgid(group, getgid());
my_getgrgid(group, getegid());
}
} else {
- group = xcalloc(9, sizeof(char));
+ strncpy(user, argv[optind], 8);
+ user[8] = '\0';
gid = my_getpwnamegid(user);
my_getgrgid(group, gid);
}
pwnam=my_getpwnam(user);
grnam=my_getgrnam(group);
if (gid == -1 || pwnam==-1 || grnam==-1) {
- fatalError("%s: No such user\n", user);
+ 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);
}