aboutsummaryrefslogtreecommitdiff
path: root/shell/shell_common.c
diff options
context:
space:
mode:
authorRon Yorston <rmy@pobox.com>2017-07-18 15:58:52 +0100
committerRon Yorston <rmy@pobox.com>2017-07-18 15:58:52 +0100
commitb680f05ad449505e3d914bebd4c8d83bf768c094 (patch)
treec08ded13d430b0e7e0104f2eb594fad190ce98a3 /shell/shell_common.c
parent258200ff81d5a9da54dab35acf36213eff1e399b (diff)
parent513a2457b65894b10b9fd6aa8753fca59eced08c (diff)
downloadbusybox-w32-b680f05ad449505e3d914bebd4c8d83bf768c094.tar.gz
busybox-w32-b680f05ad449505e3d914bebd4c8d83bf768c094.tar.bz2
busybox-w32-b680f05ad449505e3d914bebd4c8d83bf768c094.zip
Merge branch 'busybox' into merge
Diffstat (limited to 'shell/shell_common.c')
-rw-r--r--shell/shell_common.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/shell/shell_common.c b/shell/shell_common.c
index 55617b167..154b860f8 100644
--- a/shell/shell_common.c
+++ b/shell/shell_common.c
@@ -412,9 +412,7 @@ shell_builtin_ulimit(char **argv)
412 */ 412 */
413 GETOPT_RESET(); 413 GETOPT_RESET();
414 414
415 argc = 1; 415 argc = string_array_len(argv);
416 while (argv[argc])
417 argc++;
418 416
419 opts = 0; 417 opts = 0;
420 while (1) { 418 while (1) {