]>
Commit | Line | Data |
---|---|---|
e42128b9 JB |
1 | --- mksh-50/main.c.orig 2014-08-21 18:13:38.072682886 +0200 |
2 | +++ mksh-50/main.c 2014-08-21 18:29:13.715976954 +0200 | |
3 | @@ -591,10 +591,14 @@ | |
4 | if (Flag(FLOGIN)) | |
5 | include(substitute("$HOME/.profile", 0), 0, NULL, true); | |
6 | if (Flag(FTALKING)) { | |
7 | - cp = substitute(substitute("${ENV:-" MKSHRC_PATH "}", | |
8 | - 0), DOTILDE); | |
9 | + cp = substitute(substitute("${ENV}", 0), DOTILDE); | |
10 | if (cp[0] != '\0') | |
11 | include(cp, 0, NULL, true); | |
12 | + else { | |
13 | + cp = substitute(MKSHRC_PATH, DOTILDE); | |
14 | + include("/etc/mkshrc", 0, NULL, true); | |
15 | + include(cp, 0, NULL, true); | |
16 | + } | |
17 | } | |
18 | } else { | |
19 | include(MKSH_SUID_PROFILE, 0, NULL, true); |