Index: ./user/busybox/coreutils/df.c
===================================================================
RCS file: /cvsroot/dslinux/dslinux/user/busybox/coreutils/df.c,v
retrieving revision 1.2
diff -u -r1.2 df.c
--- ./user/busybox/coreutils/df.c	20 Feb 2006 14:13:30 -0000	1.2
+++ ./user/busybox/coreutils/df.c	29 Sep 2006 16:38:43 -0000
@@ -76,7 +76,7 @@
 	opt = bb_getopt_ulflags(argc, argv, "k");
 #endif
 
-	bb_printf("Filesystem%11s%-15sUsed Available Use%% Mounted on\n",
+	bb_printf("Filesystem%9s%-15sUsed Available Use%% Mounted on\n",
 			  "", disp_units_hdr);
 
 	mount_table = NULL;
@@ -120,7 +120,7 @@
 			blocks_used = s.f_blocks - s.f_bfree;
 			blocks_percent_used = 0;
 			if (blocks_used + s.f_bavail) {
-				blocks_percent_used = (((long long) blocks_used) * 100
+				blocks_percent_used = (blocks_used * 100
 									   + (blocks_used + s.f_bavail)/2
 									   ) / (blocks_used + s.f_bavail);
 			}
@@ -136,7 +136,7 @@
 			}
 
 #ifdef CONFIG_FEATURE_HUMAN_READABLE
-			bb_printf("%-21s%9s ", device,
+			bb_printf("%-19s%9s ", device,
 					  make_human_readable_str(s.f_blocks, s.f_bsize, df_disp_hr));
 
 			bb_printf("%9s ",
@@ -147,7 +147,7 @@
 					  make_human_readable_str(s.f_bavail, s.f_bsize, df_disp_hr),
 					  blocks_percent_used, mount_point);
 #else
-			bb_printf("%-21s%9ld %9ld %9ld %3ld%% %s\n",
+			bb_printf("%-19s%9ld %9ld %9ld %3ld%% %s\n",
 					  device,
 					  kscale(s.f_blocks, s.f_bsize),
 					  kscale(s.f_blocks-s.f_bfree, s.f_bsize),