diff options
| author | John Beppu <beppu@lbox.org> | 1999-12-10 07:40:08 +0000 |
|---|---|---|
| committer | John Beppu <beppu@lbox.org> | 1999-12-10 07:40:08 +0000 |
| commit | 9835541c540a5009c13655f72eb7465c5dbd854b (patch) | |
| tree | 1b2eaa19e4688873ab2a5b754ae0b2c4b36c301f | |
| parent | 21818c8a80994e71c3b518e332de0e16d9280275 (diff) | |
| download | busybox-9835541c540a5009c13655f72eb7465c5dbd854b.tar.gz | |
Fixed bug when dealing with files specified
on the command line that didn't exist.
| -rw-r--r-- | coreutils/du.c | 12 | ||||
| -rw-r--r-- | du.c | 12 |
2 files changed, 18 insertions, 6 deletions
diff --git a/coreutils/du.c b/coreutils/du.c index 79bf0ba86..76ea6d0cb 100644 --- a/coreutils/du.c +++ b/coreutils/du.c @@ -26,6 +26,7 @@ #include <fcntl.h> #include <dirent.h> #include <stdio.h> +#include <errno.h> #if 0 #include <unistd.h> #include <sys/stat.h> @@ -49,7 +50,10 @@ du(char *filename) struct stat statbuf; size_t sum; - if ((lstat(filename, &statbuf)) != 0) { return 0; } + if ((lstat(filename, &statbuf)) != 0) { + fprintf(stdout, "du: %s: %s\n", filename, strerror(errno)); + return 0; + } sum = statbuf.st_blocks; if (S_ISDIR(statbuf.st_mode)) { @@ -104,12 +108,14 @@ du_main(int argc, char **argv) if (i >= argc) { du("."); } else { + int sum; for ( ; i < argc; i++) { - printf("%-7d %s\n", du(argv[i]) >> 1, argv[i]); + sum = du(argv[i]) >> 1; + if (sum) printf("%-7d %s\n", du(argv[i]) >> 1, argv[i]); } } exit(0); } -/* $Id: du.c,v 1.3 1999/12/10 06:45:42 andersen Exp $ */ +/* $Id: du.c,v 1.4 1999/12/10 07:40:08 beppu Exp $ */ @@ -26,6 +26,7 @@ #include <fcntl.h> #include <dirent.h> #include <stdio.h> +#include <errno.h> #if 0 #include <unistd.h> #include <sys/stat.h> @@ -49,7 +50,10 @@ du(char *filename) struct stat statbuf; size_t sum; - if ((lstat(filename, &statbuf)) != 0) { return 0; } + if ((lstat(filename, &statbuf)) != 0) { + fprintf(stdout, "du: %s: %s\n", filename, strerror(errno)); + return 0; + } sum = statbuf.st_blocks; if (S_ISDIR(statbuf.st_mode)) { @@ -104,12 +108,14 @@ du_main(int argc, char **argv) if (i >= argc) { du("."); } else { + int sum; for ( ; i < argc; i++) { - printf("%-7d %s\n", du(argv[i]) >> 1, argv[i]); + sum = du(argv[i]) >> 1; + if (sum) printf("%-7d %s\n", du(argv[i]) >> 1, argv[i]); } } exit(0); } -/* $Id: du.c,v 1.3 1999/12/10 06:45:42 andersen Exp $ */ +/* $Id: du.c,v 1.4 1999/12/10 07:40:08 beppu Exp $ */ |