Changeset 1765 in MondoRescue for branches/2.2.5/mindi-busybox/coreutils/du.c

Timestamp:

Nov 4, 2007, 3:16:40 AM (16 years ago)

Author:

Bruno Cornec

Message:

Update to busybox 1.7.2

File:

• branches/2.2.5/mindi-busybox/coreutils/du.c (modified) (14 diffs)

branches/2.2.5/mindi-busybox/coreutils/du.c

@@ -24 +24 @@
  */
 
-#include <stdlib.h>
-#include <limits.h>
-#include <unistd.h>
-#include <dirent.h>
-#include <sys/stat.h>
-#include "busybox.h"
-
-#ifdef CONFIG_FEATURE_HUMAN_READABLE
-# ifdef CONFIG_FEATURE_DU_DEFAULT_BLOCKSIZE_1K
-static unsigned long disp_hr = KILOBYTE;
+#include "libbb.h"
+
+#if ENABLE_FEATURE_HUMAN_READABLE
+# if ENABLE_FEATURE_DU_DEFAULT_BLOCKSIZE_1K
+static unsigned long disp_hr = 1024;
 # else
 static unsigned long disp_hr = 512;
 # endif
-#elif defined CONFIG_FEATURE_DU_DEFAULT_BLOCKSIZE_1K
-static unsigned int disp_k = 1;
-#else
-static unsigned int disp_k; /* bss inits to 0 */
+#elif ENABLE_FEATURE_DU_DEFAULT_BLOCKSIZE_1K
+static unsigned disp_k = 1;
+#else
+static unsigned disp_k; /* bss inits to 0 */
 #endif
 
@@ -46 +41 @@
 static nlink_t count_hardlinks = 1;
 
-static int status
-#if EXIT_SUCCESS == 0
-    = EXIT_SUCCESS
-#endif
-    ;
+static int status;
 static int print_files;
 static int slink_depth;
@@ -58 +49 @@
 
 
-static void print(long size, char *filename)
+static void print(long size, const char *const filename)
 {
     /* TODO - May not want to defer error checking here. */
-#ifdef CONFIG_FEATURE_HUMAN_READABLE
-    bb_printf("%s\t%s\n", make_human_readable_str(size, 512, disp_hr),
-           filename);
+#if ENABLE_FEATURE_HUMAN_READABLE
+    printf("%s\t%s\n", make_human_readable_str(size, 512, disp_hr),
+            filename);
 #else
     if (disp_k) {
@@ -69 +60 @@
         size >>= 1;
     }
-    bb_printf("%ld\t%s\n", size, filename);
+    printf("%ld\t%s\n", size, filename);
 #endif
 }
 
 /* tiny recursive du */
-static long du(char *filename)
+static long du(const char *const filename)
 {
     struct stat statbuf;
     long sum;
 
-    if ((lstat(filename, &statbuf)) != 0) {
+    if (lstat(filename, &statbuf) != 0) {
         bb_perror_msg("%s", filename);
         status = EXIT_FAILURE;
@@ -97 +88 @@
     if (S_ISLNK(statbuf.st_mode)) {
         if (slink_depth > du_depth) {   /* -H or -L */
-            if ((stat(filename, &statbuf)) != 0) {
+            if (stat(filename, &statbuf) != 0) {
                 bb_perror_msg("%s", filename);
                 status = EXIT_FAILURE;
@@ -111 +102 @@
     if (statbuf.st_nlink > count_hardlinks) {
         /* Add files/directories with links only once */
-        if (is_in_ino_dev_hashtable(&statbuf, NULL)) {
+        if (is_in_ino_dev_hashtable(&statbuf)) {
             return 0;
         }
@@ -122 +113 @@
         char *newfile;
 
-        dir = bb_opendir(filename);
+        dir = warn_opendir(filename);
         if (!dir) {
             status = EXIT_FAILURE;
@@ -136 +127 @@
 
             newfile = concat_subpath_file(filename, name);
-            if(newfile == NULL)
+            if (newfile == NULL)
                 continue;
             ++du_depth;
@@ -153 +144 @@
 }
 
+int du_main(int argc, char **argv);
 int du_main(int argc, char **argv)
 {
@@ -159 +151 @@
     int print_final_total;
     char *smax_print_depth;
-    unsigned long opt;
-
-#ifdef CONFIG_FEATURE_DU_DEFUALT_BLOCKSIZE_1K
+    unsigned opt;
+
+#if ENABLE_FEATURE_DU_DEFAULT_BLOCKSIZE_1K
     if (getenv("POSIXLY_CORRECT")) {    /* TODO - a new libbb function? */
-#ifdef CONFIG_FEATURE_HUMAN_READABLE
+#if ENABLE_FEATURE_HUMAN_READABLE
         disp_hr = 512;
 #else
@@ -171 +163 @@
 #endif
 
-    /* Note: SUSv3 specifies that -a and -s options can not be used together
+    /* Note: SUSv3 specifies that -a and -s options cannot be used together
      * in strictly conforming applications.  However, it also says that some
      * du implementations may produce output when -a and -s are used together.
@@ -177 +169 @@
      * ignore -a.  This is consistent with -s being equivalent to -d 0.
      */
-#ifdef CONFIG_FEATURE_HUMAN_READABLE
-    bb_opt_complementally = "h-km:k-hm:m-hk:H-L:L-H:s-d:d-s";
-    opt = bb_getopt_ulflags(argc, argv, "aHkLsx" "d:" "lc" "hm", &smax_print_depth);
-    if((opt & (1 << 9))) {
+#if ENABLE_FEATURE_HUMAN_READABLE
+    opt_complementary = "h-km:k-hm:m-hk:H-L:L-H:s-d:d-s";
+    opt = getopt32(argv, "aHkLsx" "d:" "lc" "hm", &smax_print_depth);
+    if (opt & (1 << 9)) {
         /* -h opt */
         disp_hr = 0;
     }
-    if((opt & (1 << 10))) {
+    if (opt & (1 << 10)) {
         /* -m opt */
-        disp_hr = MEGABYTE;
-    }
-    if((opt & (1 << 2))) {
+        disp_hr = 1024*1024;
+    }
+    if (opt & (1 << 2)) {
         /* -k opt */
-            disp_hr = KILOBYTE;
-    }
-#else
-    bb_opt_complementally = "H-L:L-H:s-d:d-s";
-    opt = bb_getopt_ulflags(argc, argv, "aHkLsx" "d:" "lc", &smax_print_depth);
-#if !defined CONFIG_FEATURE_DU_DEFAULT_BLOCKSIZE_1K
-    if((opt & (1 << 2))) {
+        disp_hr = 1024;
+    }
+#else
+    opt_complementary = "H-L:L-H:s-d:d-s";
+    opt = getopt32(argv, "aHkLsx" "d:" "lc", &smax_print_depth);
+#if !ENABLE_FEATURE_DU_DEFAULT_BLOCKSIZE_1K
+    if (opt & (1 << 2)) {
         /* -k opt */
-            disp_k = 1;
-    }
-#endif
-#endif
-    if((opt & (1 << 0))) {
+        disp_k = 1;
+    }
+#endif
+#endif
+    if (opt & (1 << 0)) {
         /* -a opt */
         print_files = INT_MAX;
     }
-    if((opt & (1 << 1))) {
+    if (opt & (1 << 1)) {
         /* -H opt */
         slink_depth = 1;
     }
-    if((opt & (1 << 3))) {
+    if (opt & (1 << 3)) {
         /* -L opt */
-            slink_depth = INT_MAX;
-    }
-    if((opt & (1 << 4))) {
+        slink_depth = INT_MAX;
+    }
+    if (opt & (1 << 4)) {
         /* -s opt */
-            max_print_depth = 0;
-        }
+        max_print_depth = 0;
+    }
     one_file_system = opt & (1 << 5); /* -x opt */
-    if((opt & (1 << 6))) {
+    if (opt & (1 << 6)) {
         /* -d opt */
-        max_print_depth = bb_xgetularg10_bnd(smax_print_depth, 0, INT_MAX);
-    }
-    if((opt & (1 << 7))) {
+        max_print_depth = xatoi_u(smax_print_depth);
+    }
+    if (opt & (1 << 7)) {
         /* -l opt */
-        count_hardlinks = INT_MAX;
+        count_hardlinks = MAXINT(nlink_t);
     }
     print_final_total = opt & (1 << 8); /* -c opt */
@@ -232 +224 @@
     argv += optind;
     if (optind >= argc) {
-        *--argv = ".";
+        *--argv = (char*)".";
         if (slink_depth == 1) {
             slink_depth = 0;
@@ -244 +236 @@
         slink_depth = slink_depth_save;
     } while (*++argv);
-#ifdef CONFIG_FEATURE_CLEAN_UP
-    reset_ino_dev_hashtable();
-#endif
-
+    if (ENABLE_FEATURE_CLEAN_UP)
+        reset_ino_dev_hashtable();
     if (print_final_total) {
         print(total, "total");
     }
 
-    bb_fflush_stdout_and_exit(status);
+    fflush_stdout_and_exit(status);
 }