midfavila
/
sbase
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

ls: fix -q 

Move qflag handling to output() instead of modifying the actual entity
name which broke recursivity.
This commit is contained in:
Quentin Rameau 2015-06-12 15:09:32 +02:00 committed by sin
parent 438d2542e4
commit b88ed2ab2d
1 changed files with 29 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
ls.c
View File

@ -102,15 +102,34 @@ output(const struct entry *ent)
struct group *gr; struct group *gr;
struct passwd *pw; struct passwd *pw;
ssize_t len; ssize_t len;
char buf[BUFSIZ], *fmt, size_t l;
char *name, *c, *u, *fmt, buf[BUFSIZ],
pwname[_SC_LOGIN_NAME_MAX], grname[_SC_LOGIN_NAME_MAX], pwname[_SC_LOGIN_NAME_MAX], grname[_SC_LOGIN_NAME_MAX],
mode[] = "----------"; mode[] = "----------";
Rune r;
if (qflag) {
name = emalloc(strlen(ent->name) + 1);
for (c = name, u = ent->name; *u; u += l) {
l = chartorune(&r, u);
if (isprintrune(r)) {
memcpy(c, u, l);
c += l;
} else {
*c++ = '?';
}
}
*c = '\0';
} else {
name = ent->name;
}
if (iflag) if (iflag)
printf("%lu ", (unsigned long)ent->ino); printf("%lu ", (unsigned long)ent->ino);
if (!lflag) { if (!lflag) {
printf("%s%s\n", ent->name, indicator(ent->mode)); printf("%s%s\n", name, indicator(ent->mode));
return; goto cleanup;
} }
if (S_ISREG(ent->mode)) if (S_ISREG(ent->mode))
mode[0] = '-'; mode[0] = '-';
@ -173,6 +192,10 @@ output(const struct entry *ent)
printf(" -> %s%s", buf, indicator(ent->tmode)); printf(" -> %s%s", buf, indicator(ent->tmode));
} }
putchar('\n'); putchar('\n');
cleanup:
if (qflag)
free(name);
} }
static int static int
@ -193,11 +216,10 @@ static void
lsdir(const char *path) lsdir(const char *path)
{ {
DIR *dp; DIR *dp;
Rune r;
struct entry ent, *ents = NULL; struct entry ent, *ents = NULL;
struct dirent *d; struct dirent *d;
size_t i, n = 0, len; size_t i, n = 0;
char cwd[PATH_MAX], *p, *q, *name; char cwd[PATH_MAX], *name;
if (!getcwd(cwd, sizeof(cwd))) if (!getcwd(cwd, sizeof(cwd)))
eprintf("getcwd:"); eprintf("getcwd:");
@ -224,21 +246,7 @@ lsdir(const char *path)
ls(&ent, Rflag); ls(&ent, Rflag);
} else { } else {
ents = ereallocarray(ents, ++n, sizeof(*ents)); ents = ereallocarray(ents, ++n, sizeof(*ents));
name = p = estrdup(d->d_name); name = estrdup(d->d_name);
if (qflag) {
q = d->d_name;
while (*q) {
len = chartorune(&r, q);
if (isprintrune(r)) {
memcpy(p, q, len);
p += len, q += len;
} else {
*p++ = '?';
q += len;
}
}
*p = '\0';
}
mkent(&ents[n - 1], name, tflag || Sflag || Fflag || iflag || lflag || pflag || Rflag, Lflag); mkent(&ents[n - 1], name, tflag || Sflag || Fflag || iflag || lflag || pflag || Rflag, Lflag);
} }
} }