X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;ds=sidebyside;f=coreutils%2Fdu.c;h=b204a025ad47ff1c001e54b9c502d9214bce2696;hb=1781188a9d6ee045a72f37b86102380909e04539;hp=7984d657a227541ca3e034a8c3cbf24e4d1c6781;hpb=44c0e17dbe06e551f73141f56d75aa79129f1aea;p=oweals%2Fbusybox.git

diff --git a/coreutils/du.c b/coreutils/du.c
index 7984d657a..b204a025a 100644
--- a/coreutils/du.c
+++ b/coreutils/du.c
@@ -6,20 +6,7 @@
  * 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
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- *
+ * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
  */
 
 /* BB_AUDIT SUSv3 compliant (unless default blocksize set to 1k) */
@@ -44,19 +31,19 @@
 #include "busybox.h"
 
 #ifdef CONFIG_FEATURE_HUMAN_READABLE
-# ifdef CONFIG_FEATURE_DU_DEFALT_BLOCKSIZE_1K
+# ifdef CONFIG_FEATURE_DU_DEFAULT_BLOCKSIZE_1K
 static unsigned long disp_hr = KILOBYTE;
 # else
 static unsigned long disp_hr = 512;
 # endif
-#elif defined CONFIG_FEATURE_DU_DEFALT_BLOCKSIZE_1K
+#elif defined CONFIG_FEATURE_DU_DEFAULT_BLOCKSIZE_1K
 static unsigned int disp_k = 1;
 #else
 static unsigned int disp_k;	/* bss inits to 0 */
 #endif
 
 static int max_print_depth = INT_MAX;
-static int count_hardlinks = 1;
+static nlink_t count_hardlinks = 1;
 
 static int status
 #if EXIT_SUCCESS == 0
@@ -77,7 +64,11 @@ static void print(long size, char *filename)
 	bb_printf("%s\t%s\n", make_human_readable_str(size, 512, disp_hr),
 		   filename);
 #else
-	bb_printf("%ld\t%s\n", size >> disp_k, filename);
+	if (disp_k) {
+		size++;
+		size >>= 1;
+	}
+	bb_printf("%ld\t%s\n", size, filename);
 #endif
 }
 
@@ -130,9 +121,8 @@ static long du(char *filename)
 		struct dirent *entry;
 		char *newfile;
 
-		dir = opendir(filename);
+		dir = bb_opendir(filename);
 		if (!dir) {
-			bb_perror_msg("%s", filename);
 			status = EXIT_FAILURE;
 			return sum;
 		}
@@ -170,14 +160,14 @@ int du_main(int argc, char **argv)
 	char *smax_print_depth;
 	unsigned long opt;
 
-#ifdef CONFIG_FEATURE_DU_DEFALT_BLOCKSIZE_1K
+#ifdef CONFIG_FEATURE_DU_DEFUALT_BLOCKSIZE_1K
 	if (getenv("POSIXLY_CORRECT")) {	/* TODO - a new libbb function? */
 #ifdef CONFIG_FEATURE_HUMAN_READABLE
 		disp_hr = 512;
 #else
 		disp_k = 0;
 #endif
-	} 
+	}
 #endif
 
 	/* Note: SUSv3 specifies that -a and -s options can not be used together
@@ -187,7 +177,7 @@ int du_main(int argc, char **argv)
 	 * ignore -a.  This is consistent with -s being equivalent to -d 0.
 	 */
 #ifdef CONFIG_FEATURE_HUMAN_READABLE
-	bb_opt_complementaly = "h-km:k-hm:m-hk:H-L:L-H:s-d:d-s";
+	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))) {
 		/* -h opt */
@@ -202,9 +192,9 @@ int du_main(int argc, char **argv)
 			disp_hr = KILOBYTE;
 	}
 #else
-	bb_opt_complementaly = "H-L:L-H:s-d:d-s";
+	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_DEFALT_BLOCKSIZE_1K
+#if !defined CONFIG_FEATURE_DU_DEFAULT_BLOCKSIZE_1K
 	if((opt & (1 << 2))) {
 		/* -k opt */
 			disp_k = 1;