X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=df.c;h=21a1dbb319fc3a04d619606437d3d2458e412bec;hb=e0244b06428c80b80719957d28a1234cc84ad0b4;hp=c387204547aef77204a2cadb0e5a26bfcf35a782;hpb=61677feff7f549a48267c2c0c50a7420de6e2599;p=oweals%2Fbusybox.git

diff --git a/df.c b/df.c
index c38720454..21a1dbb31 100644
--- a/df.c
+++ b/df.c
@@ -2,7 +2,7 @@
 /*
  * Mini df implementation for busybox
  *
- * Copyright (C) 1999,2000 by Lineo, inc.
+ * Copyright (C) 1999,2000,2001 by Lineo, inc.
  * Written by Erik Andersen <andersen@lineo.com>, <andersee@debian.org>
  * based on original code by (I think) Bruce Perens <bruce@pixar.com>.
  *
@@ -22,45 +22,76 @@
  *
  */
 
-#include "internal.h"
 #include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
 #include <mntent.h>
-#include <sys/stat.h>
 #include <sys/vfs.h>
-
-static const char df_usage[] = "df [filesystem ...]\n\n"
-	"Print the filesystem space used and space available.\n";
+#include <getopt.h>
+#include "busybox.h"
 
 extern const char mtab_file[];	/* Defined in utility.c */
+#ifdef BB_FEATURE_HUMAN_READABLE
+static unsigned long df_disp_hr = KILOBYTE; 
+#endif
 
-static int df(char *device, const char *mountPoint)
+static int do_df(char *device, const char *mount_point)
 {
 	struct statfs s;
 	long blocks_used;
 	long blocks_percent_used;
+#ifdef BB_FEATURE_HUMAN_READABLE
+	long base;
+#endif	
 
-	if (statfs(mountPoint, &s) != 0) {
-		perror(mountPoint);
+	if (statfs(mount_point, &s) != 0) {
+		perror_msg("%s", mount_point);
 		return FALSE;
 	}
 
 	if (s.f_blocks > 0) {
 		blocks_used = s.f_blocks - s.f_bfree;
-		blocks_percent_used = (long)
-			(blocks_used * 100.0 / (blocks_used + s.f_bavail) + 0.5);
-		/* Note that if /etc/fstab is missing, libc can't fix up /dev/root for us */
+		if(blocks_used == 0)
+			blocks_percent_used = 0;
+		else {
+			blocks_percent_used = (long)
+			  (blocks_used * 100.0 / (blocks_used + s.f_bavail) + 0.5);
+		}
 		if (strcmp(device, "/dev/root") == 0) {
 			/* Adjusts device to be the real root device,
 			 * or leaves device alone if it can't find it */
 			find_real_root_device_name( device);
 		}
+#ifdef BB_FEATURE_HUMAN_READABLE
+		switch (df_disp_hr) {
+			case MEGABYTE:
+				base = KILOBYTE;
+				break;
+			case KILOBYTE:
+				base = 1;
+				break;
+			default:
+				base = 0;
+		}
+		printf("%-20s %9s ", device,
+			   make_human_readable_str((unsigned long)(s.f_blocks * 
+					   (s.f_bsize/(double)KILOBYTE)), base));
+		printf("%9s ",
+			   make_human_readable_str((unsigned long)(
+					   (s.f_blocks - s.f_bfree) * 
+					   (s.f_bsize/(double)KILOBYTE)), base));
+		printf("%9s %3ld%% %s\n",
+			   make_human_readable_str((unsigned long)(s.f_bavail * 
+					   (s.f_bsize/(double)KILOBYTE)), base),
+			   blocks_percent_used, mount_point);
+#else
 		printf("%-20s %9ld %9ld %9ld %3ld%% %s\n",
-			   device,
-			   (long) (s.f_blocks * (s.f_bsize / 1024.0)),
-			   (long) ((s.f_blocks - s.f_bfree) * (s.f_bsize / 1024.0)),
-			   (long) (s.f_bavail * (s.f_bsize / 1024.0)),
-			   blocks_percent_used, mountPoint);
-
+				device,
+				(long) (s.f_blocks * (s.f_bsize / (double)KILOBYTE)),
+				(long) ((s.f_blocks - s.f_bfree)*(s.f_bsize/(double)KILOBYTE)),
+				(long) (s.f_bavail * (s.f_bsize / (double)KILOBYTE)),
+				blocks_percent_used, mount_point);
+#endif
 	}
 
 	return TRUE;
@@ -68,45 +99,67 @@ static int df(char *device, const char *mountPoint)
 
 extern int df_main(int argc, char **argv)
 {
-	printf("%-20s %-14s %s %s %s %s\n", "Filesystem",
-		   "1k-blocks", "Used", "Available", "Use%", "Mounted on");
+	int status = EXIT_SUCCESS;
+	int opt = 0;
+	int i = 0;
+	char disp_units_hdr[80] = "1k-blocks"; /* default display is kilobytes */
 
-	if (argc > 1) {
-		struct mntent *mountEntry;
-		int status;
-
-		if (**(argv + 1) == '-') {
-			usage(df_usage);
+	while ((opt = getopt(argc, argv, "k"
+#ifdef BB_FEATURE_HUMAN_READABLE
+	"hm"
+#endif
+)) > 0)
+	{
+		switch (opt) {
+#ifdef BB_FEATURE_HUMAN_READABLE
+			case 'h':
+				df_disp_hr = 0;
+				strcpy(disp_units_hdr, "     Size");
+				break;
+			case 'm':
+				df_disp_hr = MEGABYTE;
+				strcpy(disp_units_hdr, "1M-blocks");
+				break;
+#endif
+			case 'k':
+				/* default display is kilobytes */
+				break;
+			default:
+					  show_usage();
 		}
-		while (argc > 1) {
-			if ((mountEntry = findMountPoint(argv[1], mtab_file)) == 0) {
-				fprintf(stderr, "%s: can't find mount point.\n", argv[1]);
-				exit(FALSE);
-			}
-			status = df(mountEntry->mnt_fsname, mountEntry->mnt_dir);
-			if (status != 0)
-				exit(status);
-			argc--;
-			argv++;
+	}
+
+	printf("%-20s %-14s %s %s %s %s\n", "Filesystem", disp_units_hdr,
+	       "Used", "Available", "Use%", "Mounted on");
+
+	if(optind < argc) {
+		struct mntent *mount_entry;
+		for(i = optind; i < argc; i++)
+		{
+			if ((mount_entry = find_mount_point(argv[i], mtab_file)) == 0) {
+				error_msg("%s: can't find mount point.", argv[i]);
+				status = EXIT_FAILURE;
+			} else if (!do_df(mount_entry->mnt_fsname, mount_entry->mnt_dir))
+				status = EXIT_FAILURE;
 		}
-		exit(TRUE);
 	} else {
-		FILE *mountTable;
-		struct mntent *mountEntry;
+		FILE *mount_table;
+		struct mntent *mount_entry;
 
-		mountTable = setmntent(mtab_file, "r");
-		if (mountTable == 0) {
-			perror(mtab_file);
-			exit(FALSE);
+		mount_table = setmntent(mtab_file, "r");
+		if (mount_table == 0) {
+			perror_msg("%s", mtab_file);
+			return EXIT_FAILURE;
 		}
 
-		while ((mountEntry = getmntent(mountTable))) {
-			df(mountEntry->mnt_fsname, mountEntry->mnt_dir);
+		while ((mount_entry = getmntent(mount_table))) {
+			if (!do_df(mount_entry->mnt_fsname, mount_entry->mnt_dir))
+				status = EXIT_FAILURE;
 		}
-		endmntent(mountTable);
+		endmntent(mount_table);
 	}
 
-	exit(TRUE);
+	return status;
 }
 
 /*