emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

id: better wording in comments, no code changes

Browse Source
This commit is contained in:
Denis Vlasenko 2008-10-29 10:30:54 +00:00
parent 58f3c2e01e
commit e7368f16fa
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
coreutils/id.c
View File

@ -84,7 +84,7 @@ static int get_groups(const char *username, gid_t rgid, gid_t *groups, int *n)
//if (*n < 0) //if (*n < 0)
// return 0; // return 0;
//return m; //return m;
//commented here, happens below anyway //commented out here, happens below anyway
} else { } else {
/* On error -1 is returned, which ends up in *n */ /* On error -1 is returned, which ends up in *n */
int nn = getgroups(*n, groups); int nn = getgroups(*n, groups);
@ -152,9 +152,9 @@ int id_main(int argc UNUSED_PARAM, char **argv)
if (egid != rgid) if (egid != rgid)
status |= print_group(egid, " "); status |= print_group(egid, " ");
} }
/* We'd rather try supplying largish buffer than /* We are supplying largish buffer, trying
* having get_groups() run twice. That might be slow * to not run get_groups() twice. That might be slow
* (think about "user database in remove SQL server" case) */ * ("user database in remote SQL server" case) */
groups = xmalloc(64 * sizeof(gid_t)); groups = xmalloc(64 * sizeof(gid_t));
n = 64; n = 64;
if (get_groups(username, rgid, groups, &n) < 0) { if (get_groups(username, rgid, groups, &n) < 0) {
@ -171,14 +171,14 @@ int id_main(int argc UNUSED_PARAM, char **argv)
status |= print_group(groups[i], opt ? " " : prefix); status |= print_group(groups[i], opt ? " " : prefix);
prefix = ","; prefix = ",";
} }
if (ENABLE_FEATURE_CLEAN_UP)
free(groups);
} else if (n < 0) { /* error in get_groups() */ } else if (n < 0) { /* error in get_groups() */
if (!ENABLE_DESKTOP) if (!ENABLE_DESKTOP)
bb_error_msg_and_die("cannot get groups"); bb_error_msg_and_die("cannot get groups");
else else
return EXIT_FAILURE; return EXIT_FAILURE;
} }
if (ENABLE_FEATURE_CLEAN_UP)
free(groups);
#if ENABLE_SELINUX #if ENABLE_SELINUX
if (is_selinux_enabled()) { if (is_selinux_enabled()) {
if (getcon(&scontext) == 0) if (getcon(&scontext) == 0)