]>
Commit | Line | Data |
---|---|---|
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,9 +591,14 @@ | |
4 | if (Flag(FLOGIN)) | |
5 | include(substitute("$HOME/.profile", 0), 0, NULL, true); | |
6 | if (Flag(FTALKING)) { | |
7 | - cp = substitute("${ENV:-" MKSHRC_PATH "}", DOTILDE); | |
8 | + cp = substitute("${ENV}", DOTILDE); | |
9 | if (cp[0] != '\0') | |
10 | include(cp, 0, NULL, true); | |
11 | + else { | |
12 | + cp = substitute(MKSHRC_PATH, DOTILDE); | |
13 | + include("/etc/mkshrc", 0, NULL, true); | |
14 | + include(cp, 0, NULL, true); | |
15 | + } | |
16 | } | |
17 | } else { | |
18 | include(MKSH_SUID_PROFILE, 0, NULL, true); |