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

Use xrealpath() in du(1)

Browse Source
This commit is contained in:
sin 2014-01-23 21:16:05 +00:00
parent 3ef662c988
commit 5be9c21ce4
1 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
du.c
View File

@ -26,6 +26,17 @@ usage(void)
eprintf("usage: %s [-a | -s] [-k] [file...]\n", argv0); eprintf("usage: %s [-a | -s] [-k] [file...]\n", argv0);
} }
static char *
xrealpath(const char *pathname, char *resolved)
{
char *r;
r = realpath(pathname, resolved);
if (!r)
eprintf("realpath: %s:");
return r;
}
int int
main(int argc, char *argv[]) main(int argc, char *argv[])
{ {
@ -59,12 +70,12 @@ main(int argc, char *argv[])
if (argc < 1) { if (argc < 1) {
n = du("."); n = du(".");
if (sflag) if (sflag)
print(n, realpath(".", file)); print(n, xrealpath(".", file));
} else { } else {
for (; argc > 0; argc--, argv++) { for (; argc > 0; argc--, argv++) {
n = du(argv[0]); n = du(argv[0]);
if (sflag) if (sflag)
print(n, realpath(argv[0], file)); print(n, xrealpath(argv[0], file));
} }
} }
return EXIT_SUCCESS; return EXIT_SUCCESS;
@ -142,7 +153,7 @@ du(const char *path)
cwd, dent->d_name) >= sizeof(file)) cwd, dent->d_name) >= sizeof(file))
enprintf(EXIT_FAILURE, "path too long\n"); enprintf(EXIT_FAILURE, "path too long\n");
} else { } else {
realpath(dent->d_name, file); xrealpath(dent->d_name, file);
} }
print(m, file); print(m, file);
} }
@ -152,6 +163,6 @@ du(const char *path)
done: done:
if (!sflag) if (!sflag)
print(n, realpath(path, file)); print(n, xrealpath(path, file));
return n; return n;
} }