diff options
Diffstat (limited to '')
| -rw-r--r-- | src/df.c | 15 |
1 files changed, 6 insertions, 9 deletions
@@ -24,7 +24,6 @@ #include <getopt.h> #include "system.h" -#include "canonicalize.h" #include "error.h" #include "fsusage.h" #include "human.h" @@ -333,10 +332,10 @@ show_dev (char const *disk, char const *mount_point, bool negate_used; double pct = -1; - if (me_remote & show_local_fs) + if (me_remote && show_local_fs) return; - if (me_dummy & !show_all_fs & !show_listed_fs) + if (me_dummy && !show_all_fs && !show_listed_fs) return; if (!selected_fstype (fstype) || excluded_fstype (fstype)) @@ -431,7 +430,7 @@ show_dev (char const *disk, char const *mount_point, total = fsu.fsu_blocks; available = fsu.fsu_bavail; negate_available = (fsu.fsu_bavail_top_bit_set - & known_value (available)); + && known_value (available)); available_to_root = fsu.fsu_bfree; if (known_value (total)) @@ -833,11 +832,9 @@ Mandatory arguments to long options are mandatory for short options too.\n\ "), stdout); fputs (HELP_OPTION_DESCRIPTION, stdout); fputs (VERSION_OPTION_DESCRIPTION, stdout); - fputs (_("\n\ -SIZE may be (or may be an integer optionally followed by) one of following:\n\ -kB 1000, K 1024, MB 1000*1000, M 1024*1024, and so on for G, T, P, E, Z, Y.\n\ -"), stdout); - emit_bug_reporting_address (); + emit_blocksize_note ("DF"); + emit_size_note (); + emit_ancillary_info (); } exit (status); } |