[packages/mksh.git] / mksh-mkshrc_support.patch

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