diff options
author | Ron Yorston <rmy@pobox.com> | 2017-09-27 10:08:12 +0100 |
---|---|---|
committer | Ron Yorston <rmy@pobox.com> | 2017-09-27 10:11:19 +0100 |
commit | d9383e984da8de72e61e5094a3cf6404c5707ddc (patch) | |
tree | dd42825854fc42aea40d4f7a95548d53721d1733 /shell/shell_common.c | |
parent | 166b3e4e82799f87d3b002c7177891111eff079e (diff) | |
parent | 0c4dbd481aedb5d22c1048e7f7eb547a3b5e50a5 (diff) | |
download | busybox-w32-d9383e984da8de72e61e5094a3cf6404c5707ddc.tar.gz busybox-w32-d9383e984da8de72e61e5094a3cf6404c5707ddc.tar.bz2 busybox-w32-d9383e984da8de72e61e5094a3cf6404c5707ddc.zip |
Merge branch 'busybox' into merge
Diffstat (limited to 'shell/shell_common.c')
-rw-r--r-- | shell/shell_common.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/shell/shell_common.c b/shell/shell_common.c index bc34de404..ad9048d89 100644 --- a/shell/shell_common.c +++ b/shell/shell_common.c | |||
@@ -432,8 +432,8 @@ shell_builtin_ulimit(char **argv) | |||
432 | * ulimit 123 -c2 -l 456 | 432 | * ulimit 123 -c2 -l 456 |
433 | */ | 433 | */ |
434 | 434 | ||
435 | /* In case getopt was already called: | 435 | /* In case getopt() was already called: |
436 | * reset the libc getopt() function, which keeps internal state. | 436 | * reset libc getopt() internal state. |
437 | */ | 437 | */ |
438 | GETOPT_RESET(); | 438 | GETOPT_RESET(); |
439 | 439 | ||