From 9835541c540a5009c13655f72eb7465c5dbd854b Mon Sep 17 00:00:00 2001 From: John Beppu Date: Fri, 10 Dec 1999 07:40:08 +0000 Subject: [PATCH] Fixed bug when dealing with files specified on the command line that didn't exist. --- coreutils/du.c | 12 +++++++++--- 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 #include #include +#include #if 0 #include #include @@ -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 $ */ diff --git a/du.c b/du.c index 79bf0ba86..76ea6d0cb 100644 --- a/du.c +++ b/du.c @@ -26,6 +26,7 @@ #include #include #include +#include #if 0 #include #include @@ -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 $ */