[hackers] [sbase] Don't bail out if the username/group name does not exist in ls(1) || sin

From: <git_AT_suckless.org>
Date: Sat, 05 Apr 2014 21:23:45 +0200

commit e3c62682ff4c47e303d398074bec989eaa54aae3
Author: sin <sin_AT_2f30.org>
Date: Sat Apr 5 19:22:56 2014 +0100

    Don't bail out if the username/group name does not exist in ls(1)

diff --git a/ls.c b/ls.c
index bc6c463..5d98c92 100644
--- a/ls.c
+++ b/ls.c
_AT_@ -218,6 +218,8 @@ output(Entry *ent)
         ssize_t len;
         struct group *gr;
         struct passwd *pw;
+ char pwname[_SC_LOGIN_NAME_MAX];
+ char grname[_SC_LOGIN_NAME_MAX];
         Entry entlnk;
 
         if (iflag)
_AT_@ -259,17 +261,17 @@ output(Entry *ent)
 
         errno = 0;
         pw = getpwuid(ent->uid);
- if(errno)
- eprintf("getpwuid %d:", ent->uid);
- else if(!pw)
- eprintf("getpwuid %d: no such user
", ent->uid);
+ if(errno || !pw)
+ snprintf(pwname, sizeof(pwname), "%d", ent->uid);
+ else
+ snprintf(pwname, sizeof(pwname), "%s", pw->pw_name);
 
         errno = 0;
         gr = getgrgid(ent->gid);
- if(errno)
- eprintf("getgrgid %d:", ent->gid);
- else if(!gr)
- eprintf("getgrgid %d: no such group
", ent->gid);
+ if(errno || !gr)
+ snprintf(grname, sizeof(grname), "%d", ent->gid);
+ else
+ snprintf(grname, sizeof(grname), "%s", gr->gr_name);
 
         if(time(NULL) > ent->mtime + (180*24*60*60)) /* 6 months ago? */
                 fmt = "%b %d %Y";
_AT_@ -277,8 +279,8 @@ output(Entry *ent)
                 fmt = "%b %d %H:%M";
 
         strftime(buf, sizeof buf, fmt, localtime(&ent->mtime));
- printf("%s %2ld %-4s %-5s %6lu %s %s%s", mode, (long)ent->nlink, pw->pw_name,
- gr->gr_name, (unsigned long)ent->size, buf, ent->name, indicator(ent->mode));
+ printf("%s %2ld %-4s %-5s %6lu %s %s%s", mode, (long)ent->nlink, pwname,
+ grname, (unsigned long)ent->size, buf, ent->name, indicator(ent->mode));
         if(S_ISLNK(ent->mode)) {
                 if((len = readlink(ent->name, buf, sizeof buf)) == -1)
                         eprintf("readlink %s:", ent->name);
Received on Sat Apr 05 2014 - 21:23:45 CEST