aboutsummaryrefslogtreecommitdiff
path: root/shell
diff options
context:
space:
mode:
authorDenys Vlasenko <vda.linux@googlemail.com>2009-09-23 23:15:43 +0200
committerDenys Vlasenko <vda.linux@googlemail.com>2009-09-23 23:15:43 +0200
commit606291beabab14c85a141c7a4225fbcab8d19fbd (patch)
tree4f46cd21214432feeb610e237e8dd49ef908c8f6 /shell
parent1f27ab0d4bb65425496ff4ed0fbbd0f5bb32786f (diff)
downloadbusybox-w32-606291beabab14c85a141c7a4225fbcab8d19fbd.tar.gz
busybox-w32-606291beabab14c85a141c7a4225fbcab8d19fbd.tar.bz2
busybox-w32-606291beabab14c85a141c7a4225fbcab8d19fbd.zip
*: more portability fixes by Dan Fandrich
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
Diffstat (limited to 'shell')
-rw-r--r--shell/ash.c2
-rw-r--r--shell/bbsh.c2
-rw-r--r--shell/hush.c4
3 files changed, 4 insertions, 4 deletions
diff --git a/shell/ash.c b/shell/ash.c
index db28af7d3..b7c643195 100644
--- a/shell/ash.c
+++ b/shell/ash.c
@@ -5042,7 +5042,7 @@ struct redirtab {
5042 struct redirtab *next; 5042 struct redirtab *next;
5043 int nullredirs; 5043 int nullredirs;
5044 int pair_count; 5044 int pair_count;
5045 struct two_fd_t two_fd[0]; 5045 struct two_fd_t two_fd[];
5046}; 5046};
5047#define redirlist (G_var.redirlist) 5047#define redirlist (G_var.redirlist)
5048 5048
diff --git a/shell/bbsh.c b/shell/bbsh.c
index ad875abf5..c3726263a 100644
--- a/shell/bbsh.c
+++ b/shell/bbsh.c
@@ -54,7 +54,7 @@ struct command {
54 int flags; // exit, suspend, && || 54 int flags; // exit, suspend, && ||
55 int pid; // pid (or exit code) 55 int pid; // pid (or exit code)
56 int argc; 56 int argc;
57 char *argv[0]; 57 char *argv[];
58}; 58};
59 59
60// A collection of processes piped into/waiting on each other. 60// A collection of processes piped into/waiting on each other.
diff --git a/shell/hush.c b/shell/hush.c
index eaf911458..9db2091dd 100644
--- a/shell/hush.c
+++ b/shell/hush.c
@@ -787,7 +787,7 @@ static void xxfree(void *ptr)
787 * HUSH_DEBUG >= 2 prints line number in this file where it was detected. 787 * HUSH_DEBUG >= 2 prints line number in this file where it was detected.
788 */ 788 */
789#if HUSH_DEBUG < 2 789#if HUSH_DEBUG < 2
790# define die_if_script(lineno, fmt...) die_if_script(fmt) 790# define die_if_script(lineno, ...) die_if_script(__VA_ARGS__)
791# define syntax_error(lineno, msg) syntax_error(msg) 791# define syntax_error(lineno, msg) syntax_error(msg)
792# define syntax_error_at(lineno, msg) syntax_error_at(msg) 792# define syntax_error_at(lineno, msg) syntax_error_at(msg)
793# define syntax_error_unterm_ch(lineno, ch) syntax_error_unterm_ch(ch) 793# define syntax_error_unterm_ch(lineno, ch) syntax_error_unterm_ch(ch)
@@ -856,7 +856,7 @@ static void syntax_error_unexpected_ch(unsigned lineno, int ch)
856# undef syntax_error_unterm_str 856# undef syntax_error_unterm_str
857# undef syntax_error_unexpected_ch 857# undef syntax_error_unexpected_ch
858#else 858#else
859# define die_if_script(fmt...) die_if_script(__LINE__, fmt) 859# define die_if_script(...) die_if_script(__LINE__, __VA_ARGS__)
860# define syntax_error(msg) syntax_error(__LINE__, msg) 860# define syntax_error(msg) syntax_error(__LINE__, msg)
861# define syntax_error_at(msg) syntax_error_at(__LINE__, msg) 861# define syntax_error_at(msg) syntax_error_at(__LINE__, msg)
862# define syntax_error_unterm_ch(ch) syntax_error_unterm_ch(__LINE__, ch) 862# define syntax_error_unterm_ch(ch) syntax_error_unterm_ch(__LINE__, ch)