fix a longstanding double substitution
This commit is contained in:
parent
7d18c762d2
commit
524e63b4a1
5
main.c
5
main.c
|
@ -34,7 +34,7 @@
|
||||||
#include <locale.h>
|
#include <locale.h>
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
__RCSID("$MirOS: src/bin/mksh/main.c,v 1.343 2017/10/10 21:19:43 tg Exp $");
|
__RCSID("$MirOS: src/bin/mksh/main.c,v 1.344 2017/10/13 23:02:11 tg Exp $");
|
||||||
|
|
||||||
extern char **environ;
|
extern char **environ;
|
||||||
|
|
||||||
|
@ -661,8 +661,7 @@ main_init(int argc, const char *argv[], Source **sp, struct block **lp)
|
||||||
if (Flag(FLOGIN))
|
if (Flag(FLOGIN))
|
||||||
include(substitute("$HOME/.profile", 0), 0, NULL, true);
|
include(substitute("$HOME/.profile", 0), 0, NULL, true);
|
||||||
if (Flag(FTALKING)) {
|
if (Flag(FTALKING)) {
|
||||||
cp = substitute(substitute("${ENV:-" MKSHRC_PATH "}",
|
cp = substitute("${ENV:-" MKSHRC_PATH "}", DOTILDE);
|
||||||
0), DOTILDE);
|
|
||||||
if (cp[0] != '\0')
|
if (cp[0] != '\0')
|
||||||
include(cp, 0, NULL, true);
|
include(cp, 0, NULL, true);
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue