X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=coreutils%2Fdu.c;h=2e49b2147745224c2a0001099a51b6d010aaab37;hb=e3e2a7b41cf130004c2be3402c34646dc0ef3e24;hp=119895e491b2d5647636e419d8b80d2ad5e64a41;hpb=e5dfced23a904d08afa5dcee190c3c3d845d9f50;p=oweals%2Fbusybox.git

diff --git a/coreutils/du.c b/coreutils/du.c
index 119895e49..2e49b2147 100644
--- a/coreutils/du.c
+++ b/coreutils/du.c
@@ -2,9 +2,9 @@
 /*
  * Mini du implementation for busybox
  *
- *
- * Copyright (C) 1999,2000,2001 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
@@ -31,37 +31,24 @@
 #include <string.h>
 #include <errno.h>
 #include "busybox.h"
-#define BB_DECLARE_EXTERN
-#define bb_need_name_too_long
-#include "messages.c"
 
 
-#ifdef BB_FEATURE_HUMAN_READABLE
+#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 du_depth /*= 0*/;
+static int count_hardlinks /*= 0*/;
+static int one_file_system /*= 0*/;
+static dev_t dir_dev;
 
-static Display *print;
+static void (*print) (long, char *);
 
 static void print_normal(long size, char *filename)
 {
-	unsigned long base;
-#ifdef BB_FEATURE_HUMAN_READABLE
-	switch (disp_hr) {
-		case MEGABYTE:
-			base = KILOBYTE;
-			break;
-		case KILOBYTE:
-			base = 1;
-			break;
-		default:
-			base = 0;
-	}
-	printf("%s\t%s\n", make_human_readable_str(size, base), 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
@@ -70,7 +57,6 @@ static void print_normal(long size, char *filename)
 static void print_summary(long size, char *filename)
 {
 	if (du_depth == 1) {
-		printf("summary\n");
 		print_normal(size, filename);
 	}
 }
@@ -80,12 +66,15 @@ static long du(char *filename)
 {
 	struct stat statbuf;
 	long sum;
-	int len;
 
 	if ((lstat(filename, &statbuf)) != 0) {
 		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);
@@ -93,12 +82,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) {
@@ -106,12 +96,11 @@ 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;
 			char *name = entry->d_name;
 
 			if ((strcmp(name, "..") == 0)
@@ -124,15 +113,13 @@ static long du(char *filename)
 		}
 		closedir(dir);
 		print(sum, filename);
-	}
-	else if (statbuf.st_nlink > 1 && !count_hardlinks) {
+	} else if (statbuf.st_nlink > 1 && !count_hardlinks) {
 		/* Add files with hard links only once */
 		if (is_in_ino_dev_hashtable(&statbuf, NULL)) {
 			sum = 0L;
 			if (du_depth == 1)
 				print(sum, filename);
-		}
-		else {
+		} else {
 			add_to_ino_dev_hashtable(&statbuf, NULL);
 		}
 	}
@@ -150,26 +137,34 @@ int du_main(int argc, char **argv)
 	print = print_normal;
 
 	/* parse argv[] */
-	while ((c = getopt(argc, argv, "sl"
-#ifdef BB_FEATURE_HUMAN_READABLE
-"hm"
+	while ((c = getopt(argc, argv, "slx"
+#ifdef CONFIG_FEATURE_HUMAN_READABLE
+					   "hm"
 #endif
-"k")) != EOF) {
-			switch (c) {
-			case 's':
-					print = print_summary;
-					break;
-			case 'l':
-					count_hardlinks = 1;
-					break;
-#ifdef BB_FEATURE_HUMAN_READABLE
-			case 'h': disp_hr = 0;        break;
-			case 'm': disp_hr = MEGABYTE; break;
+					   "k")) != EOF) {
+		switch (c) {
+		case 's':
+			print = print_summary;
+			break;
+		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:
-					show_usage();
-			}
+		case 'k':
+			break;
+		default:
+			show_usage();
+		}
 	}
 
 	/* go through remaining args (if any) */
@@ -179,10 +174,9 @@ int du_main(int argc, char **argv)
 	} else {
 		long sum;
 
-		for (i=optind; i < argc; i++) {
-			if ((sum = du(argv[i])) == 0)
-				status = EXIT_FAILURE;
-			if(is_directory(argv[i], FALSE, NULL)==FALSE) {
+		for (i = optind; i < argc; i++) {
+			sum = du(argv[i]);
+			if (is_directory(argv[i], FALSE, NULL) == FALSE) {
 				print_normal(sum, argv[i]);
 			}
 			reset_ino_dev_hashtable();
@@ -192,7 +186,7 @@ int du_main(int argc, char **argv)
 	return status;
 }
 
-/* $Id: du.c,v 1.44 2001/04/09 22:48:11 andersen Exp $ */
+/* $Id: du.c,v 1.55 2002/08/23 07:28:45 aaronl Exp $ */
 /*
 Local Variables:
 c-file-style: "linux"