diff options
| author | Denis Vlasenko | 2006-10-03 21:00:06 +0000 |
|---|---|---|
| committer | Denis Vlasenko | 2006-10-03 21:00:06 +0000 |
| commit | 67b23e6043d8e2b30b0bf3bc105b8583c2a26db5 (patch) | |
| tree | edb58560b444979051b42ab7f0c0c718f7459754 /editors/sed.c | |
| parent | 40920825d59874cf285390434486e88c8498d2d8 (diff) | |
| download | busybox-67b23e6043d8e2b30b0bf3bc105b8583c2a26db5.zip 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 'editors/sed.c')
| -rw-r--r-- | editors/sed.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/editors/sed.c b/editors/sed.c index 2016652..7dba8b4 100644 --- a/editors/sed.c +++ b/editors/sed.c @@ -1109,7 +1109,7 @@ static void add_files_link(llist_t *opt_f) int sed_main(int argc, char **argv) { - unsigned long opt; + unsigned opt; llist_t *opt_e, *opt_f; int status = EXIT_SUCCESS; @@ -1126,8 +1126,8 @@ int sed_main(int argc, char **argv) /* do normal option parsing */ opt_e = opt_f = NULL; - bb_opt_complementally = "e::f::"; /* can occur multiple times */ - opt = bb_getopt_ulflags(argc, argv, "irne:f:", &opt_e, &opt_f); + opt_complementary = "e::f::"; /* can occur multiple times */ + opt = getopt32(argc, argv, "irne:f:", &opt_e, &opt_f); if (opt & 0x1) { // -i bbg.in_place++; atexit(cleanup_outname); @@ -1135,11 +1135,11 @@ int sed_main(int argc, char **argv) if (opt & 0x2) bbg.regex_type|=REG_EXTENDED; // -r if (opt & 0x4) bbg.be_quiet++; // -n if (opt & 0x8) { // -e - /* getopt_ulflags reverses order of arguments, handle it */ + /* getopt32 reverses order of arguments, handle it */ add_cmds_link(opt_e); } if (opt & 0x10) { // -f - /* getopt_ulflags reverses order of arguments, handle it */ + /* getopt32 reverses order of arguments, handle it */ add_files_link(opt_f); } /* if we didn't get a pattern from -e or -f, use argv[optind] */ |