mirror of
https://github.com/sheumann/hush.git
synced 2024-10-10 19:23:41 +00:00
df: add -a
df: don't special case rootfs and /dev/root function old new delta df_main 746 684 -62 find_block_device 111 - -111 find_block_device_in_dir 243 - -243 ------------------------------------------------------------------------------ (add/remove: 0/2 grow/shrink: 0/1 up/down: 0/-416) Total: -416 bytes
This commit is contained in:
parent
f430cdbf2e
commit
6d38dc3af4
@ -46,18 +46,19 @@ int df_main(int argc, char **argv)
|
|||||||
const char *disp_units_hdr = "1k-blocks";
|
const char *disp_units_hdr = "1k-blocks";
|
||||||
|
|
||||||
enum {
|
enum {
|
||||||
OPT_INODE = (ENABLE_FEATURE_HUMAN_READABLE ? (1 << 3) : (1 << 1))
|
OPT_ALL = (1 << 0),
|
||||||
|
OPT_INODE = (ENABLE_FEATURE_HUMAN_READABLE ? (1 << 4) : (1 << 2))
|
||||||
* ENABLE_FEATURE_DF_INODE
|
* ENABLE_FEATURE_DF_INODE
|
||||||
};
|
};
|
||||||
|
|
||||||
#if ENABLE_FEATURE_HUMAN_READABLE
|
#if ENABLE_FEATURE_HUMAN_READABLE
|
||||||
opt_complementary = "h-km:k-hm:m-hk";
|
opt_complementary = "h-km:k-hm:m-hk";
|
||||||
opt = getopt32(argv, "hmk" USE_FEATURE_DF_INODE("i"));
|
opt = getopt32(argv, "ahmk" USE_FEATURE_DF_INODE("i"));
|
||||||
if (opt & 1) {
|
if (opt & (1 << 1)) { // -h
|
||||||
df_disp_hr = 0;
|
df_disp_hr = 0;
|
||||||
disp_units_hdr = " Size";
|
disp_units_hdr = " Size";
|
||||||
}
|
}
|
||||||
if (opt & 2) {
|
if (opt & (1 << 2)) { // -m
|
||||||
df_disp_hr = 1024*1024;
|
df_disp_hr = 1024*1024;
|
||||||
disp_units_hdr = "1M-blocks";
|
disp_units_hdr = "1M-blocks";
|
||||||
}
|
}
|
||||||
@ -65,11 +66,11 @@ int df_main(int argc, char **argv)
|
|||||||
disp_units_hdr = " Inodes";
|
disp_units_hdr = " Inodes";
|
||||||
}
|
}
|
||||||
#else
|
#else
|
||||||
opt = getopt32(argv, "k" USE_FEATURE_DF_INODE("i"));
|
opt = getopt32(argv, "ak" USE_FEATURE_DF_INODE("i"));
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
printf("Filesystem%11s%-15sUsed Available Use%% Mounted on\n",
|
printf("Filesystem %-15sUsed Available Use%% Mounted on\n",
|
||||||
"", disp_units_hdr);
|
disp_units_hdr);
|
||||||
|
|
||||||
mount_table = NULL;
|
mount_table = NULL;
|
||||||
argv += optind;
|
argv += optind;
|
||||||
@ -112,7 +113,7 @@ int df_main(int argc, char **argv)
|
|||||||
goto SET_ERROR;
|
goto SET_ERROR;
|
||||||
}
|
}
|
||||||
|
|
||||||
if ((s.f_blocks > 0) || !mount_table) {
|
if ((s.f_blocks > 0) || !mount_table || (opt & OPT_ALL)) {
|
||||||
if (opt & OPT_INODE) {
|
if (opt & OPT_INODE) {
|
||||||
s.f_blocks = s.f_files;
|
s.f_blocks = s.f_files;
|
||||||
s.f_bavail = s.f_bfree = s.f_ffree;
|
s.f_bavail = s.f_bfree = s.f_ffree;
|
||||||
@ -130,9 +131,13 @@ int df_main(int argc, char **argv)
|
|||||||
) / (blocks_used + s.f_bavail);
|
) / (blocks_used + s.f_bavail);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#ifdef WHY_IT_SHOULD_BE_HIDDEN
|
||||||
if (strcmp(device, "rootfs") == 0) {
|
if (strcmp(device, "rootfs") == 0) {
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
#endif
|
||||||
|
#ifdef WHY_WE_DO_IT_FOR_DEV_ROOT_ONLY
|
||||||
|
/* ... and also this is the only user of find_block_device */
|
||||||
if (strcmp(device, "/dev/root") == 0) {
|
if (strcmp(device, "/dev/root") == 0) {
|
||||||
/* Adjusts device to be the real root device,
|
/* Adjusts device to be the real root device,
|
||||||
* or leaves device alone if it can't find it */
|
* or leaves device alone if it can't find it */
|
||||||
@ -141,6 +146,7 @@ int df_main(int argc, char **argv)
|
|||||||
goto SET_ERROR;
|
goto SET_ERROR;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
if (printf("\n%-20s" + 1, device) > 20)
|
if (printf("\n%-20s" + 1, device) > 20)
|
||||||
printf("\n%-20s", "");
|
printf("\n%-20s", "");
|
||||||
|
Loading…
Reference in New Issue
Block a user