diff options
author | Denis Vlasenko <vda.linux@googlemail.com> | 2007-04-14 15:08:41 +0000 |
---|---|---|
committer | Denis Vlasenko <vda.linux@googlemail.com> | 2007-04-14 15:08:41 +0000 |
commit | e4712758138aabfce1cfd8ade232fd17988f23f4 (patch) | |
tree | 991ef2c2fbc644eca44f5bbf18dfc30745d85d40 | |
parent | 5f9468e99649c0daa5cacfe180fbd0e061df6fc3 (diff) | |
download | busybox-w32-e4712758138aabfce1cfd8ade232fd17988f23f4.tar.gz busybox-w32-e4712758138aabfce1cfd8ade232fd17988f23f4.tar.bz2 busybox-w32-e4712758138aabfce1cfd8ade232fd17988f23f4.zip |
msh: style fixes
shell/README - a place to record things about busybox shells
-rw-r--r-- | shell/README | 6 | ||||
-rw-r--r-- | shell/msh.c | 10 |
2 files changed, 10 insertions, 6 deletions
diff --git a/shell/README b/shell/README new file mode 100644 index 000000000..ea1174379 --- /dev/null +++ b/shell/README | |||
@@ -0,0 +1,6 @@ | |||
1 | Various bits of what is known about busybox shells, in no particular order. | ||
2 | |||
3 | 2007-04-14 | ||
4 | lash, hush: both do setsid() and as a result don't have ctty! | ||
5 | Ctrl-C doesn't work for any child (try rm -i), etc... | ||
6 | lash: bare ">file" doesn't create a file (hush works) | ||
diff --git a/shell/msh.c b/shell/msh.c index ae18061d6..91e302fac 100644 --- a/shell/msh.c +++ b/shell/msh.c | |||
@@ -2117,7 +2117,6 @@ static struct op *newtp(void) | |||
2117 | 2117 | ||
2118 | static struct op *namelist(struct op *t) | 2118 | static struct op *namelist(struct op *t) |
2119 | { | 2119 | { |
2120 | |||
2121 | DBGPRINTF7(("NAMELIST: enter, t=%p, type %s, iolist=%p\n", t, | 2120 | DBGPRINTF7(("NAMELIST: enter, t=%p, type %s, iolist=%p\n", t, |
2122 | T_CMD_NAMES[t->type], iolist)); | 2121 | T_CMD_NAMES[t->type], iolist)); |
2123 | 2122 | ||
@@ -2658,7 +2657,7 @@ static int execute(struct op *t, int *pin, int *pout, int act) | |||
2658 | 2657 | ||
2659 | }; | 2658 | }; |
2660 | 2659 | ||
2661 | broken: | 2660 | broken: |
2662 | t->words = wp2; | 2661 | t->words = wp2; |
2663 | isbreak = 0; | 2662 | isbreak = 0; |
2664 | freehere(areanum); | 2663 | freehere(areanum); |
@@ -2681,13 +2680,13 @@ static int execute(struct op *t, int *pin, int *pout, int act) | |||
2681 | 2680 | ||
2682 | typedef int (*builtin_func_ptr)(struct op *); | 2681 | typedef int (*builtin_func_ptr)(struct op *); |
2683 | 2682 | ||
2684 | static builtin_func_ptr inbuilt(const char *s) { | 2683 | static builtin_func_ptr inbuilt(const char *s) |
2684 | { | ||
2685 | const struct builtincmd *bp; | 2685 | const struct builtincmd *bp; |
2686 | 2686 | ||
2687 | for (bp = builtincmds; bp->name; bp++) | 2687 | for (bp = builtincmds; bp->name; bp++) |
2688 | if (strcmp(bp->name, s) == 0) | 2688 | if (strcmp(bp->name, s) == 0) |
2689 | return bp->builtinfunc; | 2689 | return bp->builtinfunc; |
2690 | |||
2691 | return NULL; | 2690 | return NULL; |
2692 | } | 2691 | } |
2693 | 2692 | ||
@@ -4379,8 +4378,7 @@ static struct wdblock *addword(char *wd, struct wdblock *wb) | |||
4379 | return wb; | 4378 | return wb; |
4380 | } | 4379 | } |
4381 | 4380 | ||
4382 | static | 4381 | static char **getwords(struct wdblock *wb) |
4383 | char **getwords(struct wdblock *wb) | ||
4384 | { | 4382 | { |
4385 | char **wd; | 4383 | char **wd; |
4386 | int nb; | 4384 | int nb; |