svn commit: trunk/busybox/coreutils
vda at busybox.net
vda at busybox.net
Wed Oct 29 10:30:55 UTC 2008
Author: vda
Date: 2008-10-29 03:30:54 -0700 (Wed, 29 Oct 2008)
New Revision: 23845
Log:
id: better wording in comments, no code changes
Modified:
trunk/busybox/coreutils/id.c
Changeset:
Modified: trunk/busybox/coreutils/id.c
===================================================================
--- trunk/busybox/coreutils/id.c 2008-10-29 07:35:03 UTC (rev 23844)
+++ trunk/busybox/coreutils/id.c 2008-10-29 10:30:54 UTC (rev 23845)
@@ -84,7 +84,7 @@
//if (*n < 0)
// return 0;
//return m;
- //commented here, happens below anyway
+ //commented out here, happens below anyway
} else {
/* On error -1 is returned, which ends up in *n */
int nn = getgroups(*n, groups);
@@ -152,9 +152,9 @@
if (egid != rgid)
status |= print_group(egid, " ");
}
- /* We'd rather try supplying largish buffer than
- * having get_groups() run twice. That might be slow
- * (think about "user database in remove SQL server" case) */
+ /* We are supplying largish buffer, trying
+ * to not run get_groups() twice. That might be slow
+ * ("user database in remote SQL server" case) */
groups = xmalloc(64 * sizeof(gid_t));
n = 64;
if (get_groups(username, rgid, groups, &n) < 0) {
@@ -171,14 +171,14 @@
status |= print_group(groups[i], opt ? " " : prefix);
prefix = ",";
}
- if (ENABLE_FEATURE_CLEAN_UP)
- free(groups);
} else if (n < 0) { /* error in get_groups() */
if (!ENABLE_DESKTOP)
bb_error_msg_and_die("cannot get groups");
else
return EXIT_FAILURE;
}
+ if (ENABLE_FEATURE_CLEAN_UP)
+ free(groups);
#if ENABLE_SELINUX
if (is_selinux_enabled()) {
if (getcon(&scontext) == 0)
More information about the busybox-cvs
mailing list