diff options
| author | Glenn L McGrath <bug1@ihug.co.nz> | 2003-09-02 02:36:18 +0000 |
|---|---|---|
| committer | Glenn L McGrath <bug1@ihug.co.nz> | 2003-09-02 02:36:18 +0000 |
| commit | dc4e75ef7ca135c836d22e380847672cf5b3773b (patch) | |
| tree | d2ff4fef7b9192de63761935103699569ecbb2ee /shell/msh.c | |
| parent | 005f83adf511ab89296639abbef737ad4e5826f9 (diff) | |
| download | busybox-w32-dc4e75ef7ca135c836d22e380847672cf5b3773b.tar.gz busybox-w32-dc4e75ef7ca135c836d22e380847672cf5b3773b.tar.bz2 busybox-w32-dc4e75ef7ca135c836d22e380847672cf5b3773b.zip | |
move all "-/bin/sh" "/bin/sh" and "sh" to libbb/messages.c file as one
constant.
Vodz last_patch_107
Diffstat (limited to '')
| -rw-r--r-- | shell/msh.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/shell/msh.c b/shell/msh.c index a142c451a..31dd04f3e 100644 --- a/shell/msh.c +++ b/shell/msh.c | |||
| @@ -668,7 +668,6 @@ static char *null = ""; | |||
| 668 | static int heedint =1; | 668 | static int heedint =1; |
| 669 | static struct env e ={line, iostack, iostack-1, (xint *)NULL, FDBASE, (struct env *)NULL}; | 669 | static struct env e ={line, iostack, iostack-1, (xint *)NULL, FDBASE, (struct env *)NULL}; |
| 670 | static void (*qflag)(int) = SIG_IGN; | 670 | static void (*qflag)(int) = SIG_IGN; |
| 671 | static char shellname[] = "/bin/sh"; | ||
| 672 | static int startl; | 671 | static int startl; |
| 673 | static int peeksym; | 672 | static int peeksym; |
| 674 | static int nlseen; | 673 | static int nlseen; |
| @@ -717,7 +716,7 @@ extern int msh_main(int argc, char **argv) | |||
| 717 | 716 | ||
| 718 | shell = lookup("SHELL"); | 717 | shell = lookup("SHELL"); |
| 719 | if (shell->value == null) | 718 | if (shell->value == null) |
| 720 | setval(shell, shellname); | 719 | setval(shell, DEFAULT_SHELL); |
| 721 | export(shell); | 720 | export(shell); |
| 722 | 721 | ||
| 723 | homedir = lookup("HOME"); | 722 | homedir = lookup("HOME"); |
| @@ -2871,7 +2870,7 @@ char *c, **v, **envp; | |||
| 2871 | *v = e.linep; | 2870 | *v = e.linep; |
| 2872 | tp = *--v; | 2871 | tp = *--v; |
| 2873 | *v = e.linep; | 2872 | *v = e.linep; |
| 2874 | execve(shellname, v, envp); | 2873 | execve(DEFAULT_SHELL, v, envp); |
| 2875 | *v = tp; | 2874 | *v = tp; |
| 2876 | return("no Shell"); | 2875 | return("no Shell"); |
| 2877 | 2876 | ||
| @@ -3902,7 +3901,7 @@ int quoted; | |||
| 3902 | dup2(pf[1], 1); | 3901 | dup2(pf[1], 1); |
| 3903 | closepipe(pf); | 3902 | closepipe(pf); |
| 3904 | 3903 | ||
| 3905 | argument_list[0] = shellname; | 3904 | argument_list[0] = (char *)DEFAULT_SHELL; |
| 3906 | argument_list[1] = "-c"; | 3905 | argument_list[1] = "-c"; |
| 3907 | argument_list[2] = child_cmd; | 3906 | argument_list[2] = child_cmd; |
| 3908 | argument_list[3] = 0; | 3907 | argument_list[3] = 0; |