diff options
| author | Alexander Shishkin | 2010-10-21 00:24:05 +0200 |
|---|---|---|
| committer | Denys Vlasenko | 2010-10-21 00:24:05 +0200 |
| commit | a7027bf89e57d59958641ee7033e0f85f26ef412 (patch) | |
| tree | 31e60559d25894c6992e00138607c85150d38ae3 | |
| parent | 894ef6003242bcb0b5ae4ba766475ed048b9f5ca (diff) | |
| download | busybox-a7027bf89e57d59958641ee7033e0f85f26ef412.zip busybox-a7027bf89e57d59958641ee7033e0f85f26ef412.tar.gz | |
stat: remove superfluous setXXent() calls, plug memory leak
function old new delta
print_stat 875 865 -10
Signed-off-by: Alexander Shishkin <virtuoso@slind.org>
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
| -rw-r--r-- | coreutils/stat.c | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/coreutils/stat.c b/coreutils/stat.c index 7771972..d176d07 100644 --- a/coreutils/stat.c +++ b/coreutils/stat.c @@ -247,14 +247,12 @@ static void FAST_FUNC print_stat(char *pformat, const char m, strcat(pformat, "lu"); printf(pformat, (unsigned long) statbuf->st_uid); } else if (m == 'U') { - setpwent(); pw_ent = getpwuid(statbuf->st_uid); printfs(pformat, (pw_ent != NULL) ? pw_ent->pw_name : "UNKNOWN"); } else if (m == 'g') { strcat(pformat, "lu"); printf(pformat, (unsigned long) statbuf->st_gid); } else if (m == 'G') { - setgrent(); gw_ent = getgrgid(statbuf->st_gid); printfs(pformat, (gw_ent != NULL) ? gw_ent->gr_name : "UNKNOWN"); } else if (m == 't') { @@ -591,20 +589,20 @@ static bool do_stat(const char *filename, const char *format) # endif } else { char *linkname = NULL; - struct passwd *pw_ent; struct group *gw_ent; - setgrent(); + gw_ent = getgrgid(statbuf.st_gid); - setpwent(); pw_ent = getpwuid(statbuf.st_uid); if (S_ISLNK(statbuf.st_mode)) linkname = xmalloc_readlink_or_warn(filename); - if (linkname) + if (linkname) { printf(" File: '%s' -> '%s'\n", filename, linkname); - else + free(linkname); + } else { printf(" File: '%s'\n", filename); + } printf(" Size: %-10llu\tBlocks: %-10llu IO Block: %-6lu %s\n" "Device: %llxh/%llud\tInode: %-10llu Links: %-5lu", |