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

diff -urNp -x '*.orig' mksh-59c.org/main.c mksh-59c/main.c
--- mksh-59c.org/main.c	2020-10-01 22:29:21.000000000 +0200
+++ mksh-59c/main.c	2021-03-20 19:54:06.508364229 +0100
@@ -695,9 +695,14 @@ main_init(int argc, const char *argv[],
 		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);
+			}
 		}
 	}
 	if (restricted_shell) {
Commit	Line	Data
ee1bb74a AM	1	diff -urNp -x '*.orig' mksh-59c.org/main.c mksh-59c/main.c
	2	--- mksh-59c.org/main.c 2020-10-01 22:29:21.000000000 +0200
	3	+++ mksh-59c/main.c 2021-03-20 19:54:06.508364229 +0100
	4	@@ -695,9 +695,14 @@ main_init(int argc, const char *argv[],
e42128b9 JB	5	if (Flag(FLOGIN))
	6	include(substitute("$HOME/.profile", 0), 0, NULL, true);
	7	if (Flag(FTALKING)) {
17021960 JP	8	- cp = substitute("${ENV:-" MKSHRC_PATH "}", DOTILDE);
17021960 JP	9	+ cp = substitute("${ENV}", DOTILDE);
e42128b9 JB	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	}
ee1bb74a AM	18	}
ee1bb74a AM	19	if (restricted_shell) {