diff options
author | Denys Vlasenko <vda.linux@googlemail.com> | 2009-09-06 02:36:23 +0200 |
---|---|---|
committer | Denys Vlasenko <vda.linux@googlemail.com> | 2009-09-06 02:36:23 +0200 |
commit | 90a9904e9ef5f2fb70e1952cb1a68bd9213bcde3 (patch) | |
tree | 46fabe3a471368b0bcee393123539775346d3410 /shell | |
parent | 1f7c167b23dfd5b03f386a657cb95867e1605e1b (diff) | |
download | busybox-w32-90a9904e9ef5f2fb70e1952cb1a68bd9213bcde3.tar.gz busybox-w32-90a9904e9ef5f2fb70e1952cb1a68bd9213bcde3.tar.bz2 busybox-w32-90a9904e9ef5f2fb70e1952cb1a68bd9213bcde3.zip |
remove some GNUisms. by Dan Fandrich (dan AT coneharvesters.com)
function old new delta
logdirs_reopen 1310 1308 -2
read_line_input 4757 4753 -4
------------------------------------------------------------------------------
(add/remove: 0/0 grow/shrink: 0/2 up/down: 0/-6) Total: -6 bytes
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
Diffstat (limited to 'shell')
-rw-r--r-- | shell/bbsh.c | 2 | ||||
-rw-r--r-- | shell/hush.c | 5 |
2 files changed, 4 insertions, 3 deletions
diff --git a/shell/bbsh.c b/shell/bbsh.c index 897c0227c..ad875abf5 100644 --- a/shell/bbsh.c +++ b/shell/bbsh.c | |||
@@ -212,7 +212,7 @@ int bbsh_main(int argc, char **argv) | |||
212 | unsigned cmdlen=0; | 212 | unsigned cmdlen=0; |
213 | for (;;) { | 213 | for (;;) { |
214 | if (!f) putchar('$'); | 214 | if (!f) putchar('$'); |
215 | if (1 > getline(&command, &cmdlen,f ? : stdin)) break; | 215 | if (1 > getline(&command, &cmdlen, f ? f : stdin)) break; |
216 | 216 | ||
217 | handle(command); | 217 | handle(command); |
218 | } | 218 | } |
diff --git a/shell/hush.c b/shell/hush.c index 5794b1ddf..30eddadcc 100644 --- a/shell/hush.c +++ b/shell/hush.c | |||
@@ -5794,7 +5794,7 @@ static struct pipe *parse_stream(char **pstring, | |||
5794 | * found. When recursing, quote state is passed in via dest->o_escape. | 5794 | * found. When recursing, quote state is passed in via dest->o_escape. |
5795 | */ | 5795 | */ |
5796 | debug_printf_parse("parse_stream entered, end_trigger='%c'\n", | 5796 | debug_printf_parse("parse_stream entered, end_trigger='%c'\n", |
5797 | end_trigger ? : 'X'); | 5797 | end_trigger ? end_trigger : 'X'); |
5798 | debug_enter(); | 5798 | debug_enter(); |
5799 | 5799 | ||
5800 | G.ifs = get_local_var_value("IFS"); | 5800 | G.ifs = get_local_var_value("IFS"); |
@@ -6860,7 +6860,8 @@ static int FAST_FUNC builtin_cd(char **argv) | |||
6860 | * bash says "bash: cd: HOME not set" and does nothing | 6860 | * bash says "bash: cd: HOME not set" and does nothing |
6861 | * (exitcode 1) | 6861 | * (exitcode 1) |
6862 | */ | 6862 | */ |
6863 | newdir = get_local_var_value("HOME") ? : "/"; | 6863 | const char *home = get_local_var_value("HOME"); |
6864 | newdir = home ? home : "/"; | ||
6864 | } | 6865 | } |
6865 | if (chdir(newdir)) { | 6866 | if (chdir(newdir)) { |
6866 | /* Mimic bash message exactly */ | 6867 | /* Mimic bash message exactly */ |