diff options
| -rw-r--r-- | lib/lib.c | 23 | ||||
| -rw-r--r-- | lib/lib.h | 2 | ||||
| -rw-r--r-- | toys/posix/ls.c | 18 |
3 files changed, 26 insertions, 17 deletions
@@ -1184,3 +1184,26 @@ int regexec0(regex_t *preg, char *string, long len, int nmatch, len -= ll; } } + +// Return user name or string representation of number, returned buffer +// lasts until next call. +char *getusername(uid_t uid) +{ + struct passwd *pw = bufgetpwuid(uid); + static char unum[12]; + + sprintf(unum, "%u", (unsigned)uid); + return pw ? pw->pw_name : unum; +} + +// Return group name or string representation of number, returned buffer +// lasts until next call. +char *getgroupname(gid_t gid) +{ + struct group *gr = bufgetgrgid(gid); + static char gnum[12]; + + sprintf(gnum, "%u", (unsigned)gid); + return gr ? gr->gr_name : gnum; +} + @@ -223,6 +223,8 @@ int readlinkat0(int dirfd, char *path, char *buf, int len); int readlink0(char *path, char *buf, int len); int regexec0(regex_t *preg, char *string, long len, int nmatch, regmatch_t pmatch[], int eflags); +char *getusername(uid_t uid); +char *getgroupname(gid_t gid); #define HR_SPACE 1 // Space between number and units #define HR_B 2 // Use "B" for single byte units diff --git a/toys/posix/ls.c b/toys/posix/ls.c index 3ad28da4..d48fb831 100644 --- a/toys/posix/ls.c +++ b/toys/posix/ls.c @@ -61,7 +61,7 @@ GLOBALS( unsigned screen_width; int nl_title; - char uid_buf[12], gid_buf[12], *escmore; + char *escmore; ) // Callback from crunch_str to represent unprintable chars @@ -121,22 +121,6 @@ static char endtype(struct stat *st) return 0; } -static char *getusername(uid_t uid) -{ - struct passwd *pw = bufgetpwuid(uid); - - sprintf(TT.uid_buf, "%u", (unsigned)uid); - return pw ? pw->pw_name : TT.uid_buf; -} - -static char *getgroupname(gid_t gid) -{ - struct group *gr = bufgetgrgid(gid); - - sprintf(TT.gid_buf, "%u", (unsigned)gid); - return gr ? gr->gr_name : TT.gid_buf; -} - static int numlen(long long ll) { return snprintf(0, 0, "%llu", ll); |