diff options
author | Denis Vlasenko <vda.linux@googlemail.com> | 2008-12-03 11:59:12 +0000 |
---|---|---|
committer | Denis Vlasenko <vda.linux@googlemail.com> | 2008-12-03 11:59:12 +0000 |
commit | 81c3a1d0b2be02c1d675e6dceb500ce6b3da3282 (patch) | |
tree | c95a1b90ea9c5a287435cb6c7ccb7516bce78c4a | |
parent | 6ebb2f56d57ee2e900954d2264b605353cf44ca2 (diff) | |
download | busybox-w32-81c3a1d0b2be02c1d675e6dceb500ce6b3da3282.tar.gz busybox-w32-81c3a1d0b2be02c1d675e6dceb500ce6b3da3282.tar.bz2 busybox-w32-81c3a1d0b2be02c1d675e6dceb500ce6b3da3282.zip |
ash: remove TODO which seems to actually work now.
no code changes
-rw-r--r-- | shell/ash.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/shell/ash.c b/shell/ash.c index 913779ab4..2a71a2cf2 100644 --- a/shell/ash.c +++ b/shell/ash.c | |||
@@ -75,7 +75,7 @@ | |||
75 | #endif | 75 | #endif |
76 | 76 | ||
77 | #if defined(__uClinux__) | 77 | #if defined(__uClinux__) |
78 | #error "Do not even bother, ash will not run on uClinux" | 78 | #error "Do not even bother, ash will not run on NOMMU machine" |
79 | #endif | 79 | #endif |
80 | 80 | ||
81 | 81 | ||
@@ -90,7 +90,7 @@ | |||
90 | 90 | ||
91 | #define xbarrier() do { __asm__ __volatile__ ("": : :"memory"); } while (0) | 91 | #define xbarrier() do { __asm__ __volatile__ ("": : :"memory"); } while (0) |
92 | 92 | ||
93 | /* C99 say: "char" declaration may be signed or unsigned default */ | 93 | /* C99 says: "char" declaration may be signed or unsigned by default */ |
94 | #define signed_char2int(sc) ((int)((signed char)sc)) | 94 | #define signed_char2int(sc) ((int)((signed char)sc)) |
95 | 95 | ||
96 | 96 | ||
@@ -4679,7 +4679,6 @@ waitforjob(struct job *jp) | |||
4679 | * $ bash -c './sleep5intoff; echo hi' | 4679 | * $ bash -c './sleep5intoff; echo hi' |
4680 | * ^C^C^C^C <--- pressing ^C once a second | 4680 | * ^C^C^C^C <--- pressing ^C once a second |
4681 | * $ _ | 4681 | * $ _ |
4682 | * TODO: we do not execute "echo hi" as bash does: | ||
4683 | * $ bash -c './sleep5intoff; echo hi' | 4682 | * $ bash -c './sleep5intoff; echo hi' |
4684 | * ^\^\^\^\hi <--- pressing ^\ (SIGQUIT) | 4683 | * ^\^\^\^\hi <--- pressing ^\ (SIGQUIT) |
4685 | * $ _ | 4684 | * $ _ |
@@ -5556,9 +5555,8 @@ evalbackcmd(union node *n, struct backcmd *result) | |||
5556 | result->buf = NULL; | 5555 | result->buf = NULL; |
5557 | result->nleft = 0; | 5556 | result->nleft = 0; |
5558 | result->jp = NULL; | 5557 | result->jp = NULL; |
5559 | if (n == NULL) { | 5558 | if (n == NULL) |
5560 | goto out; | 5559 | goto out; |
5561 | } | ||
5562 | 5560 | ||
5563 | saveherefd = herefd; | 5561 | saveherefd = herefd; |
5564 | herefd = -1; | 5562 | herefd = -1; |
@@ -5665,7 +5663,7 @@ expari(int quotes) | |||
5665 | int flag; | 5663 | int flag; |
5666 | int len; | 5664 | int len; |
5667 | 5665 | ||
5668 | /* ifsfree(); */ | 5666 | /* ifsfree(); */ |
5669 | 5667 | ||
5670 | /* | 5668 | /* |
5671 | * This routine is slightly over-complicated for | 5669 | * This routine is slightly over-complicated for |
@@ -5983,8 +5981,9 @@ varunset(const char *end, const char *var, const char *umsg, int varflags) | |||
5983 | if (*end == CTLENDVAR) { | 5981 | if (*end == CTLENDVAR) { |
5984 | if (varflags & VSNUL) | 5982 | if (varflags & VSNUL) |
5985 | tail = " or null"; | 5983 | tail = " or null"; |
5986 | } else | 5984 | } else { |
5987 | msg = umsg; | 5985 | msg = umsg; |
5986 | } | ||
5988 | } | 5987 | } |
5989 | ash_msg_and_raise_error("%.*s: %s%s", end - var - 1, var, msg, tail); | 5988 | ash_msg_and_raise_error("%.*s: %s%s", end - var - 1, var, msg, tail); |
5990 | } | 5989 | } |
@@ -6178,8 +6177,9 @@ subevalvar(char *p, char *str, int strloc, int subtype, | |||
6178 | idx++; | 6177 | idx++; |
6179 | rmesc++; | 6178 | rmesc++; |
6180 | } | 6179 | } |
6181 | } else | 6180 | } else { |
6182 | idx = loc; | 6181 | idx = loc; |
6182 | } | ||
6183 | 6183 | ||
6184 | for (loc = repl; *loc; loc++) { | 6184 | for (loc = repl; *loc; loc++) { |
6185 | restart_detect = stackblock(); | 6185 | restart_detect = stackblock(); |