diff options
author | Ron Yorston <rmy@pobox.com> | 2016-10-19 17:01:55 +0100 |
---|---|---|
committer | Ron Yorston <rmy@pobox.com> | 2016-10-19 17:01:55 +0100 |
commit | 075814c60a316cfd088c88f26f75ab21b5850b98 (patch) | |
tree | f6e33ac693630827deb309faa5fa4931588db57d /shell/shell_common.c | |
parent | 977d65c1bbc57f5cdd0c8bfd67c8b5bb1cd390dd (diff) | |
parent | f37e1155aabde6bd95d267a8aec347cedccb8bc3 (diff) | |
download | busybox-w32-075814c60a316cfd088c88f26f75ab21b5850b98.tar.gz busybox-w32-075814c60a316cfd088c88f26f75ab21b5850b98.tar.bz2 busybox-w32-075814c60a316cfd088c88f26f75ab21b5850b98.zip |
Merge branch busybox (up to "ash: comment out free(p) just before...")
Diffstat (limited to 'shell/shell_common.c')
-rw-r--r-- | shell/shell_common.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/shell/shell_common.c b/shell/shell_common.c index c3bff477d..5a5b1780d 100644 --- a/shell/shell_common.c +++ b/shell/shell_common.c | |||
@@ -25,6 +25,7 @@ const char defifsvar[] ALIGN1 = "IFS= \t\n"; | |||
25 | #else | 25 | #else |
26 | const char defifsvar[] ALIGN1 = "IFS= \t\n\r"; | 26 | const char defifsvar[] ALIGN1 = "IFS= \t\n\r"; |
27 | #endif | 27 | #endif |
28 | const char defoptindvar[] ALIGN1 = "OPTIND=1"; | ||
28 | 29 | ||
29 | 30 | ||
30 | int FAST_FUNC is_well_formed_var_name(const char *s, char terminator) | 31 | int FAST_FUNC is_well_formed_var_name(const char *s, char terminator) |