diff options
author | Denys Vlasenko <vda.linux@googlemail.com> | 2010-01-28 02:24:24 +0100 |
---|---|---|
committer | Denys Vlasenko <vda.linux@googlemail.com> | 2010-01-28 02:24:24 +0100 |
commit | 6b9f1633537e2ff06eb1a0741e4598a294f40fcb (patch) | |
tree | a13f4f3558c2988bc95b5a59c9996da64a0bd570 /shell | |
parent | 17323a6245597f16321e6bf99536ae9bb89c79cf (diff) | |
download | busybox-w32-6b9f1633537e2ff06eb1a0741e4598a294f40fcb.tar.gz busybox-w32-6b9f1633537e2ff06eb1a0741e4598a294f40fcb.tar.bz2 busybox-w32-6b9f1633537e2ff06eb1a0741e4598a294f40fcb.zip |
*: style fixes. no code changes (verified with objdump)
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
Diffstat (limited to 'shell')
-rw-r--r-- | shell/lash_unused.c | 13 | ||||
-rw-r--r-- | shell/msh_unused.c | 7 |
2 files changed, 13 insertions, 7 deletions
diff --git a/shell/lash_unused.c b/shell/lash_unused.c index 107ce88f6..513918962 100644 --- a/shell/lash_unused.c +++ b/shell/lash_unused.c | |||
@@ -950,8 +950,12 @@ static int parse_command(char **command_ptr, struct job *job, int *inbg) | |||
950 | *buf++ = '\\'; | 950 | *buf++ = '\\'; |
951 | *buf++ = '\\'; | 951 | *buf++ = '\\'; |
952 | } | 952 | } |
953 | } else if (*src == '*' || *src == '?' || *src == '[' || | 953 | } else |
954 | *src == ']') *buf++ = '\\'; | 954 | if (*src == '*' || *src == '?' |
955 | || *src == '[' || *src == ']' | ||
956 | ) { | ||
957 | *buf++ = '\\'; | ||
958 | } | ||
955 | *buf++ = *src; | 959 | *buf++ = *src; |
956 | } else if (isspace(*src)) { | 960 | } else if (isspace(*src)) { |
957 | if (*prog->argv[argc_l] || (flag & LASH_OPT_SAW_QUOTE)) { | 961 | if (*prog->argv[argc_l] || (flag & LASH_OPT_SAW_QUOTE)) { |
@@ -1365,8 +1369,9 @@ static int busy_loop(FILE *input) | |||
1365 | continue; | 1369 | continue; |
1366 | } | 1370 | } |
1367 | 1371 | ||
1368 | if (!parse_command(&next_command, &newjob, &inbg) && | 1372 | if (!parse_command(&next_command, &newjob, &inbg) |
1369 | newjob.num_progs) { | 1373 | && newjob.num_progs |
1374 | ) { | ||
1370 | int pipefds[2] = { -1, -1 }; | 1375 | int pipefds[2] = { -1, -1 }; |
1371 | debug_printf("job=%p fed to run_command by busy_loop()'\n", | 1376 | debug_printf("job=%p fed to run_command by busy_loop()'\n", |
1372 | &newjob); | 1377 | &newjob); |
diff --git a/shell/msh_unused.c b/shell/msh_unused.c index d4fe3db1b..54680226a 100644 --- a/shell/msh_unused.c +++ b/shell/msh_unused.c | |||
@@ -3873,9 +3873,10 @@ static char *blank(int f) | |||
3873 | scanequals = 0; | 3873 | scanequals = 0; |
3874 | for (;;) { | 3874 | for (;;) { |
3875 | c = subgetc('"', foundequals); | 3875 | c = subgetc('"', foundequals); |
3876 | if (c == 0 || | 3876 | if (c == 0 |
3877 | f & (DOBLANK && any(c, ifs->value)) || | 3877 | || f & (DOBLANK && any(c, ifs->value)) |
3878 | (!INSUB() && any(c, "\"'"))) { | 3878 | || (!INSUB() && any(c, "\"'")) |
3879 | ) { | ||
3879 | scanequals = 0; | 3880 | scanequals = 0; |
3880 | unget(c); | 3881 | unget(c); |
3881 | if (any(c, "\"'")) | 3882 | if (any(c, "\"'")) |