Apple-2gs-SW/hush
1
0
Fork 0
mirror of https://github.com/sheumann/hush.git synced 2024-12-27 16:31:24 +00:00
Code Issues Projects Releases Wiki Activity

df was totally broken. So I fixed it.

Browse Source 
-Erik
This commit is contained in:
Eric Andersen 2001-02-21 00:24:51 +00:00
parent 8d7bdc9deb
commit 7c3e7ac940
2 changed files with 64 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
coreutils/df.c
View File

@ -39,6 +39,9 @@ static int df(char *device, const char *mountPoint)
struct statfs s; struct statfs s;
long blocks_used; long blocks_used;
long blocks_percent_used; long blocks_percent_used;
#ifdef BB_FEATURE_HUMAN_READABLE
long divisor, base;
#endif
if (statfs(mountPoint, &s) != 0) { if (statfs(mountPoint, &s) != 0) {
perror_msg("%s", mountPoint); perror_msg("%s", mountPoint);
@ -59,20 +62,38 @@ static int df(char *device, const char *mountPoint)
find_real_root_device_name( device); find_real_root_device_name( device);
} }
#ifdef BB_FEATURE_HUMAN_READABLE #ifdef BB_FEATURE_HUMAN_READABLE
printf("%-20s %9s %9s %9s %3ld%% %s\n", switch (disp_hr) {
device, case MEGABYTE:
format((s.f_blocks * s.f_bsize), disp_hr), fprintf(stderr, "got MEGABYTE\n");
format((s.f_blocks - s.f_bfree) * s.f_bsize, disp_hr), divisor = KILOBYTE;
format(s.f_bavail * s.f_bsize, disp_hr), base = KILOBYTE;
break;
case KILOBYTE:
fprintf(stderr, "got KILOBYTE\n");
divisor = KILOBYTE;
base = 1;
break;
default:
fprintf(stderr, "got something else\n");
divisor = KILOBYTE;
base = 0;
}
printf("%-20s %9s ", device,
format((s.f_blocks * (s.f_bsize / divisor)), base));
printf("%9s ",
format(((s.f_blocks - s.f_bfree) *
(s.f_bsize / divisor)), base));
printf("%9s %3ld%% %s\n",
format((s.f_bavail * (s.f_bsize / divisor)), base),
blocks_percent_used, mountPoint); blocks_percent_used, mountPoint);
#else #else
printf("%-20s %9ld %9ld %9ld %3ld%% %s\n", printf("%-20s %9ld %9ld %9ld %3ld%% %s\n",
device, device,
(long) (s.f_blocks * s.f_bsize) / KILOBYTE, (long) (s.f_blocks * (s.f_bsize / KILOBYTE)),
(long) ((s.f_blocks - s.f_bfree) * 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_bavail * (s.f_bsize / KILOBYTE)),
blocks_percent_used, mountPoint); blocks_percent_used, mountPoint);
#endif #endif
} }

43
df.c
View File

@ -39,6 +39,9 @@ static int df(char *device, const char *mountPoint)
struct statfs s; struct statfs s;
long blocks_used; long blocks_used;
long blocks_percent_used; long blocks_percent_used;
#ifdef BB_FEATURE_HUMAN_READABLE
long divisor, base;
#endif
if (statfs(mountPoint, &s) != 0) { if (statfs(mountPoint, &s) != 0) {
perror_msg("%s", mountPoint); perror_msg("%s", mountPoint);
@ -59,20 +62,38 @@ static int df(char *device, const char *mountPoint)
find_real_root_device_name( device); find_real_root_device_name( device);
} }
#ifdef BB_FEATURE_HUMAN_READABLE #ifdef BB_FEATURE_HUMAN_READABLE
printf("%-20s %9s %9s %9s %3ld%% %s\n", switch (disp_hr) {
device, case MEGABYTE:
format((s.f_blocks * s.f_bsize), disp_hr), fprintf(stderr, "got MEGABYTE\n");
format((s.f_blocks - s.f_bfree) * s.f_bsize, disp_hr), divisor = KILOBYTE;
format(s.f_bavail * s.f_bsize, disp_hr), base = KILOBYTE;
break;
case KILOBYTE:
fprintf(stderr, "got KILOBYTE\n");
divisor = KILOBYTE;
base = 1;
break;
default:
fprintf(stderr, "got something else\n");
divisor = KILOBYTE;
base = 0;
}
printf("%-20s %9s ", device,
format((s.f_blocks * (s.f_bsize / divisor)), base));
printf("%9s ",
format(((s.f_blocks - s.f_bfree) *
(s.f_bsize / divisor)), base));
printf("%9s %3ld%% %s\n",
format((s.f_bavail * (s.f_bsize / divisor)), base),
blocks_percent_used, mountPoint); blocks_percent_used, mountPoint);
#else #else
printf("%-20s %9ld %9ld %9ld %3ld%% %s\n", printf("%-20s %9ld %9ld %9ld %3ld%% %s\n",
device, device,
(long) (s.f_blocks * s.f_bsize) / KILOBYTE, (long) (s.f_blocks * (s.f_bsize / KILOBYTE)),
(long) ((s.f_blocks - s.f_bfree) * 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_bavail * (s.f_bsize / KILOBYTE)),
blocks_percent_used, mountPoint); blocks_percent_used, mountPoint);
#endif #endif
} }