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

Simplify ls -q implementation

Browse Source
This commit is contained in:
sin 2015-02-18 15:55:57 +00:00
parent 93cc2ecc5c
commit 9bd094193d
1 changed files with 12 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
ls.c
View File

@ -179,8 +179,8 @@ lsdir(const char *path)
Rune r; Rune r;
struct entry ent, *ents = NULL; struct entry ent, *ents = NULL;
struct dirent *d; struct dirent *d;
size_t i, j, k, n = 0, len; size_t i, n = 0, len;
char *cwd, *p; char *cwd, *p, *q, *name;
cwd = agetcwd(); cwd = agetcwd();
if (!(dp = opendir(path))) if (!(dp = opendir(path)))
@ -203,30 +203,21 @@ lsdir(const char *path)
output(&ent); output(&ent);
} else { } else {
ents = erealloc(ents, ++n * sizeof(*ents)); ents = erealloc(ents, ++n * sizeof(*ents));
p = estrdup(d->d_name); name = p = estrdup(d->d_name);
if (qflag) { if (qflag) {
len = strlen(p); q = d->d_name;
for (i = 1, j = 0; j + i <= len;) { while (*p) {
if (!fullrune(p + j, i)) { len = chartorune(&r, p);
i++;
continue;
}
charntorune(&r, p + j, i);
if (isprintrune(r)) { if (isprintrune(r)) {
j += i; memcpy(p, q, len);
i = 1; p += len, q += len;
continue; } else {
*p++ = '?';
q += len;
} }
p[j] = '?';
for (k = j + 1; k < len - i + 2; k++) {
p[k] = p[k + i - 1];
}
len -= i - 1;
j += 1;
i = 1;
} }
} }
mkent(&ents[n - 1], p, tflag || Fflag || lflag || iflag, Lflag); mkent(&ents[n - 1], name, tflag || Fflag || lflag || iflag, Lflag);
} }
} }
closedir(dp); closedir(dp);