diff options
| author | mjn3 <mjn3@69ca8d6d-28ef-0310-b511-8ec308f3f277> | 2001-06-30 07:48:01 +0000 |
|---|---|---|
| committer | mjn3 <mjn3@69ca8d6d-28ef-0310-b511-8ec308f3f277> | 2001-06-30 07:48:01 +0000 |
| commit | feba8092d0fc76dd309d833d5a00c5493063213f (patch) | |
| tree | 6707b2dc51bee5c8e0f6078474247cfe48c97a38 | |
| parent | 93fa04397e9af35b6c027c31190366691651d539 (diff) | |
| download | busybox-w32-feba8092d0fc76dd309d833d5a00c5493063213f.tar.gz busybox-w32-feba8092d0fc76dd309d833d5a00c5493063213f.tar.bz2 busybox-w32-feba8092d0fc76dd309d833d5a00c5493063213f.zip | |
Fixed scaling problems involving make_human_readable_str.
git-svn-id: svn://busybox.net/trunk/busybox@2958 69ca8d6d-28ef-0310-b511-8ec308f3f277
| -rw-r--r-- | coreutils/df.c | 10 | ||||
| -rw-r--r-- | df.c | 10 |
2 files changed, 10 insertions, 10 deletions
diff --git a/coreutils/df.c b/coreutils/df.c index 6a81086cb..8cb13fa6d 100644 --- a/coreutils/df.c +++ b/coreutils/df.c | |||
| @@ -32,7 +32,7 @@ | |||
| 32 | 32 | ||
| 33 | extern const char mtab_file[]; /* Defined in utility.c */ | 33 | extern const char mtab_file[]; /* Defined in utility.c */ |
| 34 | #ifdef BB_FEATURE_HUMAN_READABLE | 34 | #ifdef BB_FEATURE_HUMAN_READABLE |
| 35 | static unsigned long df_disp_hr = 1; | 35 | static unsigned long df_disp_hr = KILOBYTE; |
| 36 | #endif | 36 | #endif |
| 37 | 37 | ||
| 38 | static int do_df(char *device, const char *mount_point) | 38 | static int do_df(char *device, const char *mount_point) |
| @@ -63,13 +63,13 @@ static int do_df(char *device, const char *mount_point) | |||
| 63 | } | 63 | } |
| 64 | #ifdef BB_FEATURE_HUMAN_READABLE | 64 | #ifdef BB_FEATURE_HUMAN_READABLE |
| 65 | printf("%-20s %9s ", device, | 65 | printf("%-20s %9s ", device, |
| 66 | make_human_readable_str(s.f_blocks, s.f_bsize/KILOBYTE, df_disp_hr)); | 66 | make_human_readable_str(s.f_blocks, s.f_bsize, df_disp_hr)); |
| 67 | 67 | ||
| 68 | printf("%9s ", | 68 | printf("%9s ", |
| 69 | make_human_readable_str( (s.f_blocks - s.f_bfree), s.f_bsize/KILOBYTE, df_disp_hr)); | 69 | make_human_readable_str( (s.f_blocks - s.f_bfree), s.f_bsize, df_disp_hr)); |
| 70 | 70 | ||
| 71 | printf("%9s %3ld%% %s\n", | 71 | printf("%9s %3ld%% %s\n", |
| 72 | make_human_readable_str(s.f_bavail, s.f_bsize/KILOBYTE, df_disp_hr), | 72 | make_human_readable_str(s.f_bavail, s.f_bsize, df_disp_hr), |
| 73 | blocks_percent_used, mount_point); | 73 | blocks_percent_used, mount_point); |
| 74 | #else | 74 | #else |
| 75 | printf("%-20s %9ld %9ld %9ld %3ld%% %s\n", | 75 | printf("%-20s %9ld %9ld %9ld %3ld%% %s\n", |
| @@ -104,7 +104,7 @@ extern int df_main(int argc, char **argv) | |||
| 104 | strcpy(disp_units_hdr, " Size"); | 104 | strcpy(disp_units_hdr, " Size"); |
| 105 | break; | 105 | break; |
| 106 | case 'm': | 106 | case 'm': |
| 107 | df_disp_hr = KILOBYTE; | 107 | df_disp_hr = MEGABYTE; |
| 108 | strcpy(disp_units_hdr, "1M-blocks"); | 108 | strcpy(disp_units_hdr, "1M-blocks"); |
| 109 | break; | 109 | break; |
| 110 | #endif | 110 | #endif |
| @@ -32,7 +32,7 @@ | |||
| 32 | 32 | ||
| 33 | extern const char mtab_file[]; /* Defined in utility.c */ | 33 | extern const char mtab_file[]; /* Defined in utility.c */ |
| 34 | #ifdef BB_FEATURE_HUMAN_READABLE | 34 | #ifdef BB_FEATURE_HUMAN_READABLE |
| 35 | static unsigned long df_disp_hr = 1; | 35 | static unsigned long df_disp_hr = KILOBYTE; |
| 36 | #endif | 36 | #endif |
| 37 | 37 | ||
| 38 | static int do_df(char *device, const char *mount_point) | 38 | static int do_df(char *device, const char *mount_point) |
| @@ -63,13 +63,13 @@ static int do_df(char *device, const char *mount_point) | |||
| 63 | } | 63 | } |
| 64 | #ifdef BB_FEATURE_HUMAN_READABLE | 64 | #ifdef BB_FEATURE_HUMAN_READABLE |
| 65 | printf("%-20s %9s ", device, | 65 | printf("%-20s %9s ", device, |
| 66 | make_human_readable_str(s.f_blocks, s.f_bsize/KILOBYTE, df_disp_hr)); | 66 | make_human_readable_str(s.f_blocks, s.f_bsize, df_disp_hr)); |
| 67 | 67 | ||
| 68 | printf("%9s ", | 68 | printf("%9s ", |
| 69 | make_human_readable_str( (s.f_blocks - s.f_bfree), s.f_bsize/KILOBYTE, df_disp_hr)); | 69 | make_human_readable_str( (s.f_blocks - s.f_bfree), s.f_bsize, df_disp_hr)); |
| 70 | 70 | ||
| 71 | printf("%9s %3ld%% %s\n", | 71 | printf("%9s %3ld%% %s\n", |
| 72 | make_human_readable_str(s.f_bavail, s.f_bsize/KILOBYTE, df_disp_hr), | 72 | make_human_readable_str(s.f_bavail, s.f_bsize, df_disp_hr), |
| 73 | blocks_percent_used, mount_point); | 73 | blocks_percent_used, mount_point); |
| 74 | #else | 74 | #else |
| 75 | printf("%-20s %9ld %9ld %9ld %3ld%% %s\n", | 75 | printf("%-20s %9ld %9ld %9ld %3ld%% %s\n", |
| @@ -104,7 +104,7 @@ extern int df_main(int argc, char **argv) | |||
| 104 | strcpy(disp_units_hdr, " Size"); | 104 | strcpy(disp_units_hdr, " Size"); |
| 105 | break; | 105 | break; |
| 106 | case 'm': | 106 | case 'm': |
| 107 | df_disp_hr = KILOBYTE; | 107 | df_disp_hr = MEGABYTE; |
| 108 | strcpy(disp_units_hdr, "1M-blocks"); | 108 | strcpy(disp_units_hdr, "1M-blocks"); |
| 109 | break; | 109 | break; |
| 110 | #endif | 110 | #endif |