ahp/busybox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix from Matt Kraai -- a better way to NULL terminate strings for the

Browse source 
my_* passwd and group routines.  I should have thought of doing it
this way...
This commit is contained in:
Eric Andersen 2000-12-13 01:52:39 +00:00
parent 77508b29fa
commit bd193a42a5
13 changed files with 26 additions and 50 deletions
Download patch file Download diff file Expand all files Collapse all files

12
coreutils/id.c
View file

@ -31,12 +31,11 @@
extern int id_main(int argc, char **argv)
{
int no_user = 0, no_group = 0, print_real = 0;
char *cp, *user, *group;
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) {
@ -57,11 +56,7 @@ extern int id_main(int argc, char **argv)
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());
@ -70,7 +65,8 @@ extern int id_main(int argc, char **argv)
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);
}