aboutsummaryrefslogtreecommitdiff
path: root/coreutils/df.c
diff options
context:
space:
mode:
authorEric Andersen <andersen@codepoet.org>2003-06-20 09:01:58 +0000
committerEric Andersen <andersen@codepoet.org>2003-06-20 09:01:58 +0000
commit8876fb2f59a0b515b3121d5894933eef88ce566a (patch)
treef67de9320202043aca8ded20fb80d668c3b0c2d8 /coreutils/df.c
parentdfce3536ace2bcd38bdd3731841998ce344d786e (diff)
downloadbusybox-w32-8876fb2f59a0b515b3121d5894933eef88ce566a.tar.gz
busybox-w32-8876fb2f59a0b515b3121d5894933eef88ce566a.tar.bz2
busybox-w32-8876fb2f59a0b515b3121d5894933eef88ce566a.zip
last_patch89 from vodz:
Manuel, I rewrite bb_getopt_ulflags() function for more universal usage. My version support now: - options with arguments (optional arg as GNU extension also) - complementaly and/or incomplementaly and/or incongruously and/or list options - long_opt (all applets may have long option, add supporting is trivial) This realisation full compatibile from your version. Code size grow 480 bytes, but only coreutils/* over compensate this size after using new function. Last patch reduced over 800 bytes and not full applied to all. "mkdir" and "mv" applets have long_opt now for demonstrate trivial addition support long_opt with usage new bb_getopt_ulflags(). Complementaly and/or incomplementaly and/or incongruously and/or list options logic is not trivial, but new "cut" and "grep" applets using this logic for examples with full demostrating. New "grep" applet reduced over 300 bytes. Mark, Also. I removed bug from "grep" applet. $ echo a b | busybox grep -e a b a b a b But right is printing one only. --w vodz
Diffstat (limited to 'coreutils/df.c')
-rw-r--r--coreutils/df.c32
1 files changed, 9 insertions, 23 deletions
diff --git a/coreutils/df.c b/coreutils/df.c
index 708e12cc0..9673633cc 100644
--- a/coreutils/df.c
+++ b/coreutils/df.c
@@ -55,41 +55,27 @@ extern int df_main(int argc, char **argv)
55 unsigned long df_disp_hr = KILOBYTE; 55 unsigned long df_disp_hr = KILOBYTE;
56#endif 56#endif
57 int status = EXIT_SUCCESS; 57 int status = EXIT_SUCCESS;
58 int opt; 58 unsigned long opt;
59 FILE *mount_table; 59 FILE *mount_table;
60 struct mntent *mount_entry; 60 struct mntent *mount_entry;
61 struct statfs s; 61 struct statfs s;
62 static const char hdr_1k[] = "1k-blocks"; /* default display is kilobytes */ 62 static const char hdr_1k[] = "1k-blocks"; /* default display is kilobytes */
63 const char *disp_units_hdr = hdr_1k; 63 const char *disp_units_hdr = hdr_1k;
64 64
65 while ((opt = getopt(argc, argv, "k"
66#ifdef CONFIG_FEATURE_HUMAN_READABLE 65#ifdef CONFIG_FEATURE_HUMAN_READABLE
67 "hm" 66 bb_opt_complementaly = "h-km:k-hm:m-hk";
68#endif 67 opt = bb_getopt_ulflags(argc, argv, "hmk");
69)) > 0) 68 if(opt & 1) {
70 {
71 switch (opt) {
72#ifdef CONFIG_FEATURE_HUMAN_READABLE
73 case 'h':
74 df_disp_hr = 0; 69 df_disp_hr = 0;
75 disp_units_hdr = " Size"; 70 disp_units_hdr = " Size";
76 break; 71 }
77 case 'm': 72 if(opt & 2) {
78 df_disp_hr = MEGABYTE; 73 df_disp_hr = MEGABYTE;
79 disp_units_hdr = "1M-blocks"; 74 disp_units_hdr = "1M-blocks";
80 break;
81#endif
82 case 'k':
83 /* default display is kilobytes */
84#ifdef CONFIG_FEATURE_HUMAN_READABLE
85 df_disp_hr = KILOBYTE;
86 disp_units_hdr = hdr_1k;
87#endif
88 break;
89 default:
90 bb_show_usage();
91 }
92 } 75 }
76#else
77 opt = bb_getopt_ulflags(argc, argv, "k");
78#endif
93 79
94 bb_printf("Filesystem%11s%-15sUsed Available Use%% Mounted on\n", 80 bb_printf("Filesystem%11s%-15sUsed Available Use%% Mounted on\n",
95 "", disp_units_hdr); 81 "", disp_units_hdr);