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/cut.c | |
| parent | 40920825d59874cf285390434486e88c8498d2d8 (diff) | |
| download | busybox-67b23e6043d8e2b30b0bf3bc105b8583c2a26db5.tar.gz | |
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/cut.c')
| -rw-r--r-- | coreutils/cut.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/coreutils/cut.c b/coreutils/cut.c index d88a891b0..30dbc02db 100644 --- a/coreutils/cut.c +++ b/coreutils/cut.c @@ -12,14 +12,13 @@ #include "busybox.h" /* option vars */ -static const char *const optstring = "b:c:f:d:sn"; - +static const char optstring[] = "b:c:f:d:sn"; #define CUT_OPT_BYTE_FLGS (1<<0) #define CUT_OPT_CHAR_FLGS (1<<1) #define CUT_OPT_FIELDS_FLGS (1<<2) #define CUT_OPT_DELIM_FLGS (1<<3) #define CUT_OPT_SUPPRESS_FLGS (1<<4) -static unsigned long opt; +static unsigned opt; static char delim = '\t'; /* delimiter, default is tab */ @@ -179,9 +178,8 @@ int cut_main(int argc, char **argv) { char *sopt, *ltok; - bb_opt_complementally = "b--bcf:c--bcf:f--bcf"; - opt = - bb_getopt_ulflags(argc, argv, optstring, &sopt, &sopt, &sopt, <ok); + opt_complementary = "b--bcf:c--bcf:f--bcf"; + opt = getopt32(argc, argv, optstring, &sopt, &sopt, &sopt, <ok); if (!(opt & (CUT_OPT_BYTE_FLGS | CUT_OPT_CHAR_FLGS | CUT_OPT_FIELDS_FLGS))) bb_error_msg_and_die ("expected a list of bytes, characters, or fields"); |