aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEric Andersen <andersen@codepoet.org>2001-02-20 21:52:49 +0000
committerEric Andersen <andersen@codepoet.org>2001-02-20 21:52:49 +0000
commit9e37007edbaaff3d431350de2c8a4a6f0469bd1d (patch)
treef618d43e02f0d6634e8dfa91cb9a857d105c4dfc
parent90fe7fea10b69d85c4d53e7061aaf85657136530 (diff)
downloadbusybox-w32-9e37007edbaaff3d431350de2c8a4a6f0469bd1d.tar.gz
busybox-w32-9e37007edbaaff3d431350de2c8a4a6f0469bd1d.tar.bz2
busybox-w32-9e37007edbaaff3d431350de2c8a4a6f0469bd1d.zip
Minor cleanup.
Diffstat
-rw-r--r--coreutils/df.c24
-rw-r--r--df.c24
2 files changed, 22 insertions, 26 deletions
diff --git a/coreutils/df.c b/coreutils/df.c
index ebee4d607..4ec75333b 100644
--- a/coreutils/df.c
+++ b/coreutils/df.c
@@ -47,33 +47,33 @@ static int df(char *device, const char *mountPoint)
47 47
48 if (s.f_blocks > 0) { 48 if (s.f_blocks > 0) {
49 blocks_used = s.f_blocks - s.f_bfree; 49 blocks_used = s.f_blocks - s.f_bfree;
50 if(0 == blocks_used) 50 if(blocks_used == 0)
51 blocks_percent_used = 0; 51 blocks_percent_used = 0;
52 else 52 else {
53 blocks_percent_used = (long) 53 blocks_percent_used = (long)
54 (blocks_used * 100.0 / (blocks_used + s.f_bavail) + 0.5); 54 (blocks_used * 100.0 / (blocks_used + s.f_bavail) + 0.5);
55 }
55 if (strcmp(device, "/dev/root") == 0) { 56 if (strcmp(device, "/dev/root") == 0) {
56 /* Adjusts device to be the real root device, 57 /* Adjusts device to be the real root device,
57 * or leaves device alone if it can't find it */ 58 * or leaves device alone if it can't find it */
58 find_real_root_device_name( device); 59 find_real_root_device_name( device);
59 } 60 }
60#ifdef BB_FEATURE_HUMAN_READABLE 61#ifdef BB_FEATURE_HUMAN_READABLE
61 printf("%-20s %9s", 62 printf("%-20s %9s %9s %9s %3ld%% %s\n",
62 device, 63 device,
63 format((s.f_blocks * s.f_bsize), disp_hr)); 64 format((s.f_blocks * s.f_bsize), disp_hr),
64 printf(" %9s", format((s.f_blocks - s.f_bfree) * s.f_bsize, disp_hr)); 65 format((s.f_blocks - s.f_bfree) * s.f_bsize, disp_hr),
65 printf(" %9s %3ld%% %s\n",
66 format(s.f_bavail * s.f_bsize, disp_hr), 66 format(s.f_bavail * s.f_bsize, disp_hr),
67 blocks_percent_used, mountPoint); 67 blocks_percent_used, mountPoint);
68#else 68#else
69 printf("%-20s %9ld %9ld %9ld %3ld%% %s\n", 69 printf("%-20s %9ld %9ld %9ld %3ld%% %s\n",
70 device, 70 device,
71 (long) (s.f_blocks * (s.f_bsize / 1024.0)), 71 (long) (s.f_blocks * s.f_bsize) / KILOBYTE,
72 (long) ((s.f_blocks - s.f_bfree) * (s.f_bsize / 1024.0)), 72 (long) ((s.f_blocks - s.f_bfree) * s.f_bsize) / KILOBYTE,
73 (long) (s.f_bavail * (s.f_bsize / 1024.0)), 73 (long) (s.f_bavail * s.f_bsize) / KILOBYTE,
74 blocks_percent_used, mountPoint); 74 blocks_percent_used, mountPoint);
75#endif
76 75
76#endif
77 } 77 }
78 78
79 return TRUE; 79 return TRUE;
@@ -96,10 +96,8 @@ extern int df_main(int argc, char **argv)
96#ifdef BB_FEATURE_HUMAN_READABLE 96#ifdef BB_FEATURE_HUMAN_READABLE
97 case 'h': disp_hr = 0; break; 97 case 'h': disp_hr = 0; break;
98 case 'm': disp_hr = MEGABYTE; break; 98 case 'm': disp_hr = MEGABYTE; break;
99 case 'k': disp_hr = KILOBYTE; break;
100#else
101 case 'k': break;
102#endif 99#endif
100 case 'k': break;
103 default: 101 default:
104 show_usage(); 102 show_usage();
105 } 103 }
diff --git a/df.c b/df.c
index ebee4d607..4ec75333b 100644
--- a/df.c
+++ b/df.c
@@ -47,33 +47,33 @@ static int df(char *device, const char *mountPoint)
47 47
48 if (s.f_blocks > 0) { 48 if (s.f_blocks > 0) {
49 blocks_used = s.f_blocks - s.f_bfree; 49 blocks_used = s.f_blocks - s.f_bfree;
50 if(0 == blocks_used) 50 if(blocks_used == 0)
51 blocks_percent_used = 0; 51 blocks_percent_used = 0;
52 else 52 else {
53 blocks_percent_used = (long) 53 blocks_percent_used = (long)
54 (blocks_used * 100.0 / (blocks_used + s.f_bavail) + 0.5); 54 (blocks_used * 100.0 / (blocks_used + s.f_bavail) + 0.5);
55 }
55 if (strcmp(device, "/dev/root") == 0) { 56 if (strcmp(device, "/dev/root") == 0) {
56 /* Adjusts device to be the real root device, 57 /* Adjusts device to be the real root device,
57 * or leaves device alone if it can't find it */ 58 * or leaves device alone if it can't find it */
58 find_real_root_device_name( device); 59 find_real_root_device_name( device);
59 } 60 }
60#ifdef BB_FEATURE_HUMAN_READABLE 61#ifdef BB_FEATURE_HUMAN_READABLE
61 printf("%-20s %9s", 62 printf("%-20s %9s %9s %9s %3ld%% %s\n",
62 device, 63 device,
63 format((s.f_blocks * s.f_bsize), disp_hr)); 64 format((s.f_blocks * s.f_bsize), disp_hr),
64 printf(" %9s", format((s.f_blocks - s.f_bfree) * s.f_bsize, disp_hr)); 65 format((s.f_blocks - s.f_bfree) * s.f_bsize, disp_hr),
65 printf(" %9s %3ld%% %s\n",
66 format(s.f_bavail * s.f_bsize, disp_hr), 66 format(s.f_bavail * s.f_bsize, disp_hr),
67 blocks_percent_used, mountPoint); 67 blocks_percent_used, mountPoint);
68#else 68#else
69 printf("%-20s %9ld %9ld %9ld %3ld%% %s\n", 69 printf("%-20s %9ld %9ld %9ld %3ld%% %s\n",
70 device, 70 device,
71 (long) (s.f_blocks * (s.f_bsize / 1024.0)), 71 (long) (s.f_blocks * s.f_bsize) / KILOBYTE,
72 (long) ((s.f_blocks - s.f_bfree) * (s.f_bsize / 1024.0)), 72 (long) ((s.f_blocks - s.f_bfree) * s.f_bsize) / KILOBYTE,
73 (long) (s.f_bavail * (s.f_bsize / 1024.0)), 73 (long) (s.f_bavail * s.f_bsize) / KILOBYTE,
74 blocks_percent_used, mountPoint); 74 blocks_percent_used, mountPoint);
75#endif
76 75
76#endif
77 } 77 }
78 78
79 return TRUE; 79 return TRUE;
@@ -96,10 +96,8 @@ extern int df_main(int argc, char **argv)
96#ifdef BB_FEATURE_HUMAN_READABLE 96#ifdef BB_FEATURE_HUMAN_READABLE
97 case 'h': disp_hr = 0; break; 97 case 'h': disp_hr = 0; break;
98 case 'm': disp_hr = MEGABYTE; break; 98 case 'm': disp_hr = MEGABYTE; break;
99 case 'k': disp_hr = KILOBYTE; break;
100#else
101 case 'k': break;
102#endif 99#endif
100 case 'k': break;
103 default: 101 default:
104 show_usage(); 102 show_usage();
105 } 103 }
generated by cgit v1.2.3-55-g6feb (git 2.39.1) at 2025-03-25 04:38:55 +0000