X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=coreutils%2Fdu.c;h=b6ebaca7a067c0dceabe19e8bb17c0e053e6a792;hb=298854f02963bd8e43dfeb7224d88cfeb0c932cb;hp=76ea6d0cb5aba27da04c6a1842f74f1a0d304dd2;hpb=9835541c540a5009c13655f72eb7465c5dbd854b;p=oweals%2Fbusybox.git

diff --git a/coreutils/du.c b/coreutils/du.c
index 76ea6d0cb..b6ebaca7a 100644
--- a/coreutils/du.c
+++ b/coreutils/du.c
@@ -1,3 +1,4 @@
+/* vi: set sw=4 ts=4: */
 /*
  * Mini du implementation for busybox
  *
@@ -22,100 +23,170 @@
  */
 
 #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 <errno.h>
-#if 0
-#include <unistd.h>
-#include <sys/stat.h>
-#endif
+#include <sys/param.h>			/* for PATH_MAX */
+
+typedef void (Display) (long, char *);
 
 static const char du_usage[] =
-"Usage: du [OPTION]... [FILE]...\n";
+	"du [OPTION]... [FILE]...\n\n"
+	"Summarize disk space used for each FILE and/or directory.\n"
+	"Disk space is printed in units of 1024 bytes.\n\n"
+	"Options:\n"
+	"\t-l\tcount sizes many times if hard linked\n"
+	"\t-s\tdisplay only a total for each argument\n";
 
-typedef void (Display)(size_t, char *);
+static int du_depth = 0;
+static int count_hardlinks = 0;
 
-static void
-print(size_t size, char *filename)
+static Display *print;
+
+static void print_normal(long size, char *filename)
 {
-    fprintf(stdout, "%-7d %s\n", (size >> 1), filename);
+	fprintf(stdout, "%ld\t%s\n", size, filename);
+}
+
+static void print_summary(long size, char *filename)
+{
+	if (du_depth == 1) {
+		print_normal(size, filename);
+	}
 }
 
 /* tiny recursive du */
-static size_t
-du(char *filename)
+static long du(char *filename)
 {
-    struct stat statbuf;
-    size_t	sum;
-
-    if ((lstat(filename, &statbuf)) != 0) { 
-	fprintf(stdout, "du: %s: %s\n", filename, strerror(errno));
-	return 0; 
-    }
-    sum = statbuf.st_blocks;
-
-    if (S_ISDIR(statbuf.st_mode)) {
-	DIR		*dir;
-	struct dirent	*entry;
-
-	dir = opendir(filename);
-	if (!dir) { return 0; }
-	while ((entry = readdir(dir))) {
-	    char newfile[512];
-	    char *name = entry->d_name;
-
-	    if (  (strcmp(name, "..") == 0)
-	       || (strcmp(name, ".")  == 0)) 
-	    { continue; }
-
-	    sprintf(newfile, "%s/%s", filename, name);
-	    sum += du(newfile);
+	struct stat statbuf;
+	long sum;
+	int len;
+
+	if ((lstat(filename, &statbuf)) != 0) {
+		printf("du: %s: %s\n", filename, strerror(errno));
+		return 0;
+	}
+
+	du_depth++;
+	sum = (statbuf.st_blocks >> 1);
+
+	/* 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 (S_ISDIR(statbuf.st_mode)) {
+		DIR *dir;
+		struct dirent *entry;
+
+		dir = opendir(filename);
+		if (!dir) {
+			du_depth--;
+			return 0;
+		}
+
+		len = strlen(filename);
+		if (filename[len - 1] == '/')
+			filename[--len] = '\0';
+
+		while ((entry = readdir(dir))) {
+			char newfile[PATH_MAX + 1];
+			char *name = entry->d_name;
+
+			if ((strcmp(name, "..") == 0)
+				|| (strcmp(name, ".") == 0)) {
+				continue;
+			}
+
+			if (len + strlen(name) + 1 > PATH_MAX) {
+				fprintf(stderr, name_too_long, "du");
+				du_depth--;
+				return 0;
+			}
+			sprintf(newfile, "%s/%s", filename, name);
+
+			sum += du(newfile);
+		}
+		closedir(dir);
+		print(sum, filename);
+	}
+	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 {
+			add_to_ino_dev_hashtable(&statbuf, NULL);
+		}
 	}
-	closedir(dir);
-	print(sum, filename);
-    }
-    return sum;
+	du_depth--;
+	return sum;
 }
 
-int 
-du_main(int argc, char **argv)
+int du_main(int argc, char **argv)
 {
-    int i;
-    char opt;
-
-    /* parse argv[] */
-    for (i = 1; i < argc; i++) {
-	if (argv[i][0] == '-') {
-	    opt = argv[i][1];
-	    switch (opt) {
-		case 's':
-		    break;
-		case 'h':
-		    usage(du_usage);
-		    break;
-		default:
-		    fprintf(stderr, "du: invalid option -- %c\n", opt);
-		    usage(du_usage);
-	    }
-	} else {
-	    break;
+	int i;
+	char opt;
+
+	/* default behaviour */
+	print = print_normal;
+
+	/* parse argv[] */
+	for (i = 1; i < argc; i++) {
+		if (argv[i][0] == '-') {
+			opt = argv[i][1];
+			switch (opt) {
+			case 's':
+				print = print_summary;
+				break;
+			case 'l':
+				count_hardlinks = 1;
+				break;
+			case 'h':
+			case '-':
+				usage(du_usage);
+				break;
+			default:
+				fprintf(stderr, "du: invalid option -- %c\n", opt);
+				usage(du_usage);
+			}
+		} else {
+			break;
+		}
 	}
-    }
-
-    /* go through remaining args (if any) */
-    if (i >= argc) {
-	du(".");
-    } else {
-	int sum;
-	for ( ; i < argc; i++) {
-	    sum = du(argv[i]) >> 1;
-	    if (sum) printf("%-7d %s\n", du(argv[i]) >> 1, argv[i]);
+
+	/* go through remaining args (if any) */
+	if (i >= argc) {
+		du(".");
+	} else {
+		long sum;
+
+		for (; i < argc; i++) {
+			sum = du(argv[i]);
+			if (sum && isDirectory(argv[i], FALSE, NULL)) {
+				print_normal(sum, argv[i]);
+			}
+			reset_ino_dev_hashtable();
+		}
 	}
-    }
 
-    exit(0);
+	exit(0);
 }
 
-/* $Id: du.c,v 1.4 1999/12/10 07:40:08 beppu Exp $ */
+/* $Id: du.c,v 1.16 2000/03/04 21:19:32 erik Exp $ */
+/*
+Local Variables:
+c-file-style: "linux"
+c-basic-offset: 4
+tab-width: 4
+End:
+*/