X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=coreutils%2Fdu.c;h=56a7a9a0cf3cc868927c9940bad06adfdcfeccff;hb=f5d5e77321ad32b3952dcdf21d14fd0ef3d4c1a9;hp=5a08abb78746d22f52c1f6cfc692da5555aeef96;hpb=47d4926244f6a444f812675f4ecff401dba5f8f7;p=oweals%2Fbusybox.git

diff --git a/coreutils/du.c b/coreutils/du.c
index 5a08abb78..56a7a9a0c 100644
--- a/coreutils/du.c
+++ b/coreutils/du.c
@@ -22,7 +22,7 @@
  *
  */
 
-#include "internal.h"
+#include "busybox.h"
 #define BB_DECLARE_EXTERN
 #define bb_need_name_too_long
 #include "messages.c"
@@ -33,6 +33,10 @@
 #include <stdio.h>
 #include <errno.h>
 
+#ifdef BB_FEATURE_HUMAN_READABLE
+unsigned long du_disp_hr = KILOBYTE;
+#endif
+
 typedef void (Display) (long, char *);
 
 static int du_depth = 0;
@@ -42,12 +46,17 @@ static Display *print;
 
 static void print_normal(long size, char *filename)
 {
-	fprintf(stdout, "%ld\t%s\n", size, filename);
+#ifdef BB_FEATURE_HUMAN_READABLE
+	printf("%s\t%s\n", format((size * KILOBYTE), du_disp_hr), filename);
+#else
+	printf("%ld\t%s\n", size, filename);
+#endif
 }
 
 static void print_summary(long size, char *filename)
 {
 	if (du_depth == 1) {
+printf("summary\n");
 		print_normal(size, filename);
 	}
 }
@@ -60,8 +69,7 @@ static long du(char *filename)
 	int len;
 
 	if ((lstat(filename, &statbuf)) != 0) {
-		printf("du: %s: %s\n", filename, strerror(errno));
-		return 0;
+		perror_msg_and_die("%s", filename);
 	}
 
 	du_depth++;
@@ -97,7 +105,7 @@ static long du(char *filename)
 			}
 
 			if (len + strlen(name) + 1 > BUFSIZ) {
-				errorMsg(name_too_long);
+				error_msg(name_too_long);
 				du_depth--;
 				return 0;
 			}
@@ -125,6 +133,7 @@ static long du(char *filename)
 
 int du_main(int argc, char **argv)
 {
+	int status = EXIT_SUCCESS;
 	int i;
 	int c;
 
@@ -132,7 +141,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, "sl"
+#ifdef BB_FEATURE_HUMAN_READABLE
+"hm"
+#endif
+"k")) != EOF) {
 			switch (c) {
 			case 's':
 					print = print_summary;
@@ -140,6 +153,13 @@ int du_main(int argc, char **argv)
 			case 'l':
 					count_hardlinks = 1;
 					break;
+#ifdef BB_FEATURE_HUMAN_READABLE
+			case 'h': du_disp_hr = 0;        break;
+			case 'm': du_disp_hr = MEGABYTE; break;
+			case 'k': du_disp_hr = KILOBYTE; break;
+#else
+			case 'k': break;
+#endif
 			default:
 					usage(du_usage);
 			}
@@ -147,23 +167,25 @@ int du_main(int argc, char **argv)
 
 	/* 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 ((sum = du(argv[i])) == 0)
+				status = EXIT_FAILURE;
+			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.34 2001/01/22 22:35:38 rjune Exp $ */
 /*
 Local Variables:
 c-file-style: "linux"