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 /shell | |
| 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 'shell')
| -rw-r--r-- | shell/bbsh.c | 2 | ||||
| -rw-r--r-- | shell/lash.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/shell/bbsh.c b/shell/bbsh.c index 2194bda..77e186d 100644 --- a/shell/bbsh.c +++ b/shell/bbsh.c @@ -203,7 +203,7 @@ int bbsh_main(int argc, char *argv[]) char *command=NULL; FILE *f; - bb_getopt_ulflags(argc, argv, "c:", &command); + getopt32(argc, argv, "c:", &command); f = argv[optind] ? xfopen(argv[optind],"r") : NULL; if (command) handle(command); diff --git a/shell/lash.c b/shell/lash.c index fd6bea1..9c862a1 100644 --- a/shell/lash.c +++ b/shell/lash.c @@ -1503,7 +1503,7 @@ static inline void setup_job_control(void) int lash_main(int argc_l, char **argv_l) { - unsigned long opt; + unsigned opt; FILE *input = stdin; argc = argc_l; argv = argv_l; @@ -1527,7 +1527,7 @@ int lash_main(int argc_l, char **argv_l) } } - opt = bb_getopt_ulflags(argc_l, argv_l, "+ic:", &local_pending_command); + opt = getopt32(argc_l, argv_l, "+ic:", &local_pending_command); #define LASH_OPT_i (1<<0) #define LASH_OPT_c (1<<2) if (opt & LASH_OPT_c) { |