svn commit: [25749] trunk/busybox/coreutils

[vda at busybox.net]

Author: vda
Date: 2009-03-19 03:56:20 +0000 (Thu, 19 Mar 2009)
New Revision: 25749

Log:
df: fix FEATURE_DF_FANCY=off, FEATURE_HUMAN_READABLE=on case.



Modified:
   trunk/busybox/coreutils/df.c


Changeset:
Modified: trunk/busybox/coreutils/df.c
===================================================================
--- trunk/busybox/coreutils/df.c	2009-03-19 03:36:18 UTC (rev 25748)
+++ trunk/busybox/coreutils/df.c	2009-03-19 03:56:20 UTC (rev 25749)
@@ -44,8 +44,7 @@
 	FILE *mount_table;
 	struct mntent *mount_entry;
 	struct statfs s;
-	static const char ignored_mounts[] ALIGN1 =
-	  "rootfs\0";
+	static const char ignored_mounts[] ALIGN1 = "rootfs\0";
 
 	enum {
 		OPT_KILO  = (1 << 0),
@@ -53,8 +52,8 @@
 		OPT_ALL   = (1 << 2) * ENABLE_FEATURE_DF_FANCY,
 		OPT_INODE = (1 << 3) * ENABLE_FEATURE_DF_FANCY,
 		OPT_BSIZE = (1 << 4) * ENABLE_FEATURE_DF_FANCY,
-		OPT_HUMAN = (1 << 5) * ENABLE_FEATURE_HUMAN_READABLE,
-		OPT_MEGA  = (1 << 6) * ENABLE_FEATURE_HUMAN_READABLE,
+		OPT_HUMAN = (1 << (2 + 3*ENABLE_FEATURE_DF_FANCY)) * ENABLE_FEATURE_HUMAN_READABLE,
+		OPT_MEGA  = (1 << (3 + 3*ENABLE_FEATURE_DF_FANCY)) * ENABLE_FEATURE_HUMAN_READABLE,
 	};
 	const char *disp_units_hdr = NULL;
 	char *chp;
@@ -124,7 +123,7 @@
 			mount_entry = find_mount_point(mount_point, bb_path_mtab_file);
 			if (!mount_entry) {
 				bb_error_msg("%s: can't find mount point", mount_point);
- SET_ERROR:
+ set_error:
 				status = EXIT_FAILURE;
 				continue;
 			}
@@ -135,7 +134,7 @@
 
 		if (statfs(mount_point, &s) != 0) {
 			bb_simple_perror_msg(mount_point);
-			goto SET_ERROR;
+			goto set_error;
 		}
 
 		if ((s.f_blocks > 0) || !mount_table || (opt & OPT_ALL)) {
@@ -166,7 +165,7 @@
 				* or leaves device alone if it can't find it */
 				device = find_block_device("/");
 				if (!device) {
-					goto SET_ERROR;
+					goto set_error;
 				}
 			}
 #endif