diff options
| author | Denis Vlasenko <vda.linux@googlemail.com> | 2007-02-25 02:37:49 +0000 |
|---|---|---|
| committer | Denis Vlasenko <vda.linux@googlemail.com> | 2007-02-25 02:37:49 +0000 |
| commit | 4222ae440a3c73ce5481b7b0e2db0da229fa76aa (patch) | |
| tree | ae43daa4fa56c238740ee64b603dfef1574b6050 /shell | |
| parent | 018e085d44206305f1d20e0111236f96f8d78c80 (diff) | |
| download | busybox-w32-4222ae440a3c73ce5481b7b0e2db0da229fa76aa.tar.gz busybox-w32-4222ae440a3c73ce5481b7b0e2db0da229fa76aa.tar.bz2 busybox-w32-4222ae440a3c73ce5481b7b0e2db0da229fa76aa.zip | |
ash: replace xstrdup (shell shall not die)
grep: fix mis-indented block
Diffstat (limited to 'shell')
| -rw-r--r-- | shell/ash.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/shell/ash.c b/shell/ash.c index 8e8577ad6..371b5d9c3 100644 --- a/shell/ash.c +++ b/shell/ash.c | |||
| @@ -2156,7 +2156,7 @@ putprompt(const char *s) | |||
| 2156 | { | 2156 | { |
| 2157 | if (ENABLE_ASH_EXPAND_PRMT) { | 2157 | if (ENABLE_ASH_EXPAND_PRMT) { |
| 2158 | free((char*)cmdedit_prompt); | 2158 | free((char*)cmdedit_prompt); |
| 2159 | cmdedit_prompt = xstrdup(s); | 2159 | cmdedit_prompt = ckstrdup(s); |
| 2160 | return; | 2160 | return; |
| 2161 | } | 2161 | } |
| 2162 | cmdedit_prompt = s; | 2162 | cmdedit_prompt = s; |
| @@ -11033,7 +11033,7 @@ dotcmd(int argc, char **argv) | |||
| 11033 | int status = 0; | 11033 | int status = 0; |
| 11034 | 11034 | ||
| 11035 | for (sp = cmdenviron; sp; sp = sp->next) | 11035 | for (sp = cmdenviron; sp; sp = sp->next) |
| 11036 | setvareq(xstrdup(sp->text), VSTRFIXED | VTEXTFIXED); | 11036 | setvareq(ckstrdup(sp->text), VSTRFIXED | VTEXTFIXED); |
| 11037 | 11037 | ||
| 11038 | if (argc >= 2) { /* That's what SVR2 does */ | 11038 | if (argc >= 2) { /* That's what SVR2 does */ |
| 11039 | char *fullname; | 11039 | char *fullname; |