aboutsummaryrefslogtreecommitdiff
path: root/shell
diff options
context:
space:
mode:
authorDenis Vlasenko <vda.linux@googlemail.com>2006-10-03 21:00:06 +0000
committerDenis Vlasenko <vda.linux@googlemail.com>2006-10-03 21:00:06 +0000
commit67b23e6043d8e2b30b0bf3bc105b8583c2a26db5 (patch)
treeedb58560b444979051b42ab7f0c0c718f7459754 /shell
parent40920825d59874cf285390434486e88c8498d2d8 (diff)
downloadbusybox-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 'shell')
-rw-r--r--shell/bbsh.c2
-rw-r--r--shell/lash.c4
2 files changed, 3 insertions, 3 deletions
diff --git a/shell/bbsh.c b/shell/bbsh.c
index 2194bdad6..77e186d35 100644
--- a/shell/bbsh.c
+++ b/shell/bbsh.c
@@ -203,7 +203,7 @@ int bbsh_main(int argc, char *argv[])
203 char *command=NULL; 203 char *command=NULL;
204 FILE *f; 204 FILE *f;
205 205
206 bb_getopt_ulflags(argc, argv, "c:", &command); 206 getopt32(argc, argv, "c:", &command);
207 207
208 f = argv[optind] ? xfopen(argv[optind],"r") : NULL; 208 f = argv[optind] ? xfopen(argv[optind],"r") : NULL;
209 if (command) handle(command); 209 if (command) handle(command);
diff --git a/shell/lash.c b/shell/lash.c
index fd6bea177..9c862a17f 100644
--- a/shell/lash.c
+++ b/shell/lash.c
@@ -1503,7 +1503,7 @@ static inline void setup_job_control(void)
1503 1503
1504int lash_main(int argc_l, char **argv_l) 1504int lash_main(int argc_l, char **argv_l)
1505{ 1505{
1506 unsigned long opt; 1506 unsigned opt;
1507 FILE *input = stdin; 1507 FILE *input = stdin;
1508 argc = argc_l; 1508 argc = argc_l;
1509 argv = argv_l; 1509 argv = argv_l;
@@ -1527,7 +1527,7 @@ int lash_main(int argc_l, char **argv_l)
1527 } 1527 }
1528 } 1528 }
1529 1529
1530 opt = bb_getopt_ulflags(argc_l, argv_l, "+ic:", &local_pending_command); 1530 opt = getopt32(argc_l, argv_l, "+ic:", &local_pending_command);
1531#define LASH_OPT_i (1<<0) 1531#define LASH_OPT_i (1<<0)
1532#define LASH_OPT_c (1<<2) 1532#define LASH_OPT_c (1<<2)
1533 if (opt & LASH_OPT_c) { 1533 if (opt & LASH_OPT_c) {