* archival/bunzip2.c (bunzip2_main): Do not remove files if writing to standard

[oweals/busybox.git] / coreutils / du.c

diff --git a/coreutils/du.c b/coreutils/du.c
index 5a08abb78746d22f52c1f6cfc692da5555aeef96..ed9f7156a1e87f90fce7da62fb81f4fa115d3dfe 100644 (file)
--- a/coreutils/du.c
+++ b/coreutils/du.c
@@ -2,9 +2,9 @@
 /*
  * Mini du implementation for busybox
  *
- *
- * Copyright (C) 1999,2000 by Lineo, inc.
- * Written by John Beppu <beppu@lineo.com>
+ * Copyright (C) 1999,2000,2001 by Lineo, inc. and John Beppu
+ * Copyright (C) 1999,2000,2001 by John Beppu <beppu@codepoet.org>
+ * Copyright (C) 2002  Edward Betts <edward@debian.org>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -22,27 +22,37 @@
  *
  */
 
-#include "internal.h"
-#define BB_DECLARE_EXTERN
-#define bb_need_name_too_long
-#include "messages.c"
-
 #include <sys/types.h>
 #include <fcntl.h>
 #include <dirent.h>
 #include <stdio.h>
+#include <stdlib.h>
+#include <getopt.h>
+#include <string.h>
 #include <errno.h>
+#include "busybox.h"
+
+
+#ifdef CONFIG_FEATURE_HUMAN_READABLE
+static unsigned long disp_hr = KILOBYTE;
+#endif
 
 typedef void (Display) (long, char *);
 
 static int du_depth = 0;
 static int count_hardlinks = 0;
+static int one_file_system = 0;
+static dev_t dir_dev = 0;
 
 static Display *print;
 
 static void print_normal(long size, char *filename)
 {
-       fprintf(stdout, "%ld\t%s\n", size, filename);
+#ifdef CONFIG_FEATURE_HUMAN_READABLE
+       printf("%s\t%s\n", make_human_readable_str(size<<10, 1, disp_hr), filename);
+#else
+       printf("%ld\t%s\n", size, filename);
+#endif
 }
 
 static void print_summary(long size, char *filename)
@@ -57,12 +67,15 @@ static long du(char *filename)
 {
        struct stat statbuf;
        long sum;
-       int len;
 
        if ((lstat(filename, &statbuf)) != 0) {
-               printf("du: %s: %s\n", filename, strerror(errno));
+               perror_msg("%s", filename);
                return 0;
        }
+       if (du_depth == 0)
+               dir_dev = statbuf.st_dev;
+       else if (one_file_system && dir_dev != statbuf.st_dev)
+               return 0;
 
        du_depth++;
        sum = (statbuf.st_blocks >> 1);
@@ -70,12 +83,13 @@ static long du(char *filename)
        /* Don't add in stuff pointed to by symbolic links */
        if (S_ISLNK(statbuf.st_mode)) {
                sum = 0L;
-               if (du_depth == 1)
-                       print(sum, filename);
+               if (du_depth == 1) {
+               }
        }
        if (S_ISDIR(statbuf.st_mode)) {
                DIR *dir;
                struct dirent *entry;
+               char *newfile;
 
                dir = opendir(filename);
                if (!dir) {
@@ -83,27 +97,20 @@ static long du(char *filename)
                        return 0;
                }
 
-               len = strlen(filename);
-               if (filename[len - 1] == '/')
-                       filename[--len] = '\0';
+               newfile = last_char_is(filename, '/');
+               if (newfile)
+                       *newfile = '\0';
 
                while ((entry = readdir(dir))) {
-                       char newfile[BUFSIZ + 1];
                        char *name = entry->d_name;
 
                        if ((strcmp(name, "..") == 0)
                                || (strcmp(name, ".") == 0)) {
                                continue;
                        }
-
-                       if (len + strlen(name) + 1 > BUFSIZ) {
-                               errorMsg(name_too_long);
-                               du_depth--;
-                               return 0;
-                       }
-                       sprintf(newfile, "%s/%s", filename, name);
-
+                       newfile = concat_path_file(filename, name);
                        sum += du(newfile);
+                       free(newfile);
                }
                closedir(dir);
                print(sum, filename);
@@ -125,6 +132,7 @@ static long du(char *filename)
 
 int du_main(int argc, char **argv)
 {
+       int status = EXIT_SUCCESS;
        int i;
        int c;
 
@@ -132,7 +140,11 @@ int du_main(int argc, char **argv)
        print = print_normal;
 
        /* parse argv[] */
-       while ((c = getopt(argc, argv, "sl")) != EOF) {
+       while ((c = getopt(argc, argv, "slx"
+#ifdef CONFIG_FEATURE_HUMAN_READABLE
+"hm"
+#endif
+"k")) != EOF) {
                        switch (c) {
                        case 's':
                                        print = print_summary;
@@ -140,30 +152,39 @@ int du_main(int argc, char **argv)
                        case 'l':
                                        count_hardlinks = 1;
                                        break;
+                       case 'x':
+                                       one_file_system = 1;
+                                       break;
+#ifdef CONFIG_FEATURE_HUMAN_READABLE
+                       case 'h': disp_hr = 0;        break;
+                       case 'm': disp_hr = MEGABYTE; break;
+#endif
+                       case 'k': break;
                        default:
-                                       usage(du_usage);
+                                       show_usage();
                        }
        }
 
        /* go through remaining args (if any) */
        if (optind >= argc) {
-               du(".");
+               if (du(".") == 0)
+                       status = EXIT_FAILURE;
        } else {
                long sum;
 
                for (i=optind; i < argc; i++) {
                        sum = du(argv[i]);
-                       if (sum && isDirectory(argv[i], FALSE, NULL)) {
+                       if(is_directory(argv[i], FALSE, NULL)==FALSE) {
                                print_normal(sum, argv[i]);
                        }
                        reset_ino_dev_hashtable();
                }
        }
 
-       return(0);
+       return status;
 }
 
-/* $Id: du.c,v 1.24 2000/07/17 16:17:19 proski Exp $ */
+/* $Id: du.c,v 1.53 2002/04/06 23:16:44 andersen Exp $ */
 /*
 Local Variables:
 c-file-style: "linux"