diff options
author | Denis Vlasenko <vda.linux@googlemail.com> | 2006-10-03 21:00:06 +0000 |
---|---|---|
committer | Denis Vlasenko <vda.linux@googlemail.com> | 2006-10-03 21:00:06 +0000 |
commit | 67b23e6043d8e2b30b0bf3bc105b8583c2a26db5 (patch) | |
tree | edb58560b444979051b42ab7f0c0c718f7459754 /coreutils/df.c | |
parent | 40920825d59874cf285390434486e88c8498d2d8 (diff) | |
download | busybox-w32-67b23e6043d8e2b30b0bf3bc105b8583c2a26db5.tar.gz busybox-w32-67b23e6043d8e2b30b0bf3bc105b8583c2a26db5.tar.bz2 busybox-w32-67b23e6043d8e2b30b0bf3bc105b8583c2a26db5.zip |
getopt_ulflags -> getopt32.
It is impossible to formulate sane ABI based on
size of ulong because it can be 32-bit or 64-bit.
Basically it means that you cannot portably use
more that 32 option chars in one call anyway...
Make it explicit.
Diffstat (limited to 'coreutils/df.c')
-rw-r--r-- | coreutils/df.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/coreutils/df.c b/coreutils/df.c index 17ce634a7..94ead32eb 100644 --- a/coreutils/df.c +++ b/coreutils/df.c | |||
@@ -41,7 +41,7 @@ int df_main(int argc, char **argv) | |||
41 | unsigned long df_disp_hr = KILOBYTE; | 41 | unsigned long df_disp_hr = KILOBYTE; |
42 | #endif | 42 | #endif |
43 | int status = EXIT_SUCCESS; | 43 | int status = EXIT_SUCCESS; |
44 | unsigned long opt; | 44 | unsigned opt; |
45 | FILE *mount_table; | 45 | FILE *mount_table; |
46 | struct mntent *mount_entry; | 46 | struct mntent *mount_entry; |
47 | struct statfs s; | 47 | struct statfs s; |
@@ -49,8 +49,8 @@ int df_main(int argc, char **argv) | |||
49 | const char *disp_units_hdr = hdr_1k; | 49 | const char *disp_units_hdr = hdr_1k; |
50 | 50 | ||
51 | #ifdef CONFIG_FEATURE_HUMAN_READABLE | 51 | #ifdef CONFIG_FEATURE_HUMAN_READABLE |
52 | bb_opt_complementally = "h-km:k-hm:m-hk"; | 52 | opt_complementary = "h-km:k-hm:m-hk"; |
53 | opt = bb_getopt_ulflags(argc, argv, "hmk"); | 53 | opt = getopt32(argc, argv, "hmk"); |
54 | if(opt & 1) { | 54 | if(opt & 1) { |
55 | df_disp_hr = 0; | 55 | df_disp_hr = 0; |
56 | disp_units_hdr = " Size"; | 56 | disp_units_hdr = " Size"; |
@@ -60,7 +60,7 @@ int df_main(int argc, char **argv) | |||
60 | disp_units_hdr = "1M-blocks"; | 60 | disp_units_hdr = "1M-blocks"; |
61 | } | 61 | } |
62 | #else | 62 | #else |
63 | opt = bb_getopt_ulflags(argc, argv, "k"); | 63 | opt = getopt32(argc, argv, "k"); |
64 | #endif | 64 | #endif |
65 | 65 | ||
66 | bb_printf("Filesystem%11s%-15sUsed Available Use%% Mounted on\n", | 66 | bb_printf("Filesystem%11s%-15sUsed Available Use%% Mounted on\n", |