up to 50f

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

diff --git a/mksh-mkshrc_support.patch b/mksh-mkshrc_support.patch
index 4208a6529f0979731375af12d23f7aa5b52da30d..15465a635bbf2e78e19492d5f59f988b3ee46529 100644 (file)
--- a/mksh-mkshrc_support.patch
+++ b/mksh-mkshrc_support.patch
@@ -1,33 +1,19 @@
---- main.c~    2011-07-06 20:43:36.679601770 +0100
-+++ main.c     2011-07-06 20:43:28.039694865 +0100
-@@ -532,6 +532,7 @@
-       else if (Flag(FTALKING)) {
-               char *env_file;
- 
-+              include("/etc/mkshrc", 0, NULL, 1);
-               /* include $ENV */
-               env_file = substitute(substitute("${ENV:-" MKSHRC_PATH "}", 0),
-                   DOTILDE);
---- check.t~   2011-07-07 09:55:26.802497928 +0100
-+++ check.t    2011-07-07 09:55:31.859107570 +0100
-@@ -5908,13 +5908,13 @@
-       Ensure ±U on the command line is honoured
-       (this test may pass falsely depending on CPPFLAGS)
- stdin:
--      export i=0
--      code='if [[ $- = *U* ]]; then echo $i on; else echo $i off; fi'
--      let i++; "$__progname" -U -c "$code"
--      let i++; "$__progname" +U -c "$code"
--      let i++; "$__progname" -U -ic "$code"
--      let i++; "$__progname" +U -ic "$code"
--      echo $((++i)) done
-+      export iter=0
-+      code='if [[ $- = *U* ]]; then echo $iter on; else echo $iter off; fi'
-+      let iter++; "$__progname" -U -c "$code"
-+      let iter++; "$__progname" +U -c "$code"
-+      let iter++; "$__progname" -U -ic "$code"
-+      let iter++; "$__progname" +U -ic "$code"
-+      echo $((++iter)) done
- expected-stdout:
-       1 on
-       2 off
+--- 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,10 +591,14 @@
+               if (Flag(FLOGIN))
+                       include(substitute("$HOME/.profile", 0), 0, NULL, true);
+               if (Flag(FTALKING)) {
+-                      cp = substitute(substitute("${ENV:-" MKSHRC_PATH "}",
+-                          0), DOTILDE);
++                      cp = substitute(substitute("${ENV}", 0), 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);