diff options
author | Eric Andersen <andersen@codepoet.org> | 2000-12-13 04:52:39 +0300 |
---|---|---|
committer | Eric Andersen <andersen@codepoet.org> | 2000-12-13 04:52:39 +0300 |
commit | bd193a42a5624f0a72b5f99d554e9a8d2afc64cc (patch) | |
tree | 7aacebe98730fbfee623943425a100fd158ba48a /id.c | |
parent | 77508b29fa63d99136fc09f00c5a2addd6331b4c (diff) |
Fix from Matt Kraai -- a better way to NULL terminate strings for the
my_* passwd and group routines. I should have thought of doing it
this way...
Diffstat (limited to 'id.c')
-rw-r--r-- | id.c | 12 |
1 files changed, 4 insertions, 8 deletions
@@ -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); } |