extern const char mtab_file[]; /* Defined in utility.c */
#ifdef BB_FEATURE_HUMAN_READABLE
-static unsigned long df_disp_hr = KILOBYTE;
+static unsigned long df_disp_hr = 1;
#endif
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(mount_point, &s) != 0) {
perror_msg("%s", mount_point);
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);
+ device = find_real_root_device_name(device);
+ if(device==NULL)
+ return FALSE;
}
#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(s.f_blocks * (s.f_bsize/KILOBYTE), base));
+ make_human_readable_str(s.f_blocks, s.f_bsize/KILOBYTE, df_disp_hr));
+
printf("%9s ",
- make_human_readable_str((s.f_blocks - s.f_bfree) * (s.f_bsize/KILOBYTE), base));
+ make_human_readable_str( (s.f_blocks - s.f_bfree), s.f_bsize/KILOBYTE, df_disp_hr));
+
printf("%9s %3ld%% %s\n",
- make_human_readable_str(s.f_bavail * (s.f_bsize/KILOBYTE), base),
- blocks_percent_used, mount_point);
+ make_human_readable_str(s.f_bavail, s.f_bsize/KILOBYTE, df_disp_hr),
+ blocks_percent_used, mount_point);
#else
printf("%-20s %9ld %9ld %9ld %3ld%% %s\n",
device,
- (long) (s.f_blocks * (s.f_bsize / KILOBYTE)),
- (long) ((s.f_blocks - s.f_bfree) * (s.f_bsize / KILOBYTE)),
- (long) (s.f_bavail * (s.f_bsize / KILOBYTE)),
+ (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
}
strcpy(disp_units_hdr, " Size");
break;
case 'm':
- df_disp_hr = MEGABYTE;
+ df_disp_hr = KILOBYTE;
strcpy(disp_units_hdr, "1M-blocks");
break;
#endif