X-Git-Url: https://git.tld-linux.org/?p=packages%2Fmksh.git;a=blobdiff_plain;f=mksh-circumflex.patch;h=97ddc42feb9186673efc120862a8c4bc94be383f;hp=8aed985fc61f01e1a4b90c2701baa6e8aa7bcf96;hb=fc8d3c2524144d640323cdf1aa7c51bf032ad5bf;hpb=5a2b33e1e24f11b9ead84554444f9210d1b85211

diff --git a/mksh-circumflex.patch b/mksh-circumflex.patch
index 8aed985..97ddc42 100644
--- a/mksh-circumflex.patch
+++ b/mksh-circumflex.patch
@@ -1,7 +1,19 @@
-diff -ur mksh-40.org//eval.c mksh-40/eval.c
---- mksh-40.org//eval.c	2011-06-12 16:45:57.000000000 +0200
-+++ mksh-40/eval.c	2011-07-07 18:27:58.891492090 +0200
-@@ -887,6 +887,7 @@
+diff -urp mksh.orig/check.t mksh/check.t
+--- mksh.orig/check.t	2016-08-12 16:48:28.000000000 +0000
++++ mksh/check.t	2016-08-18 06:51:31.069554000 +0000
+@@ -2274,7 +2274,7 @@ expected-stdout:
+ 	cbc
+ 	-bc cbc
+ 	abc bbc
+-	^bc abc bbc
++	!bc -bc ^bc cbc
+ 	!bc -bc ^bc cbc
+ ---
+ name: glob-range-2
+diff -urp mksh.orig/eval.c mksh/eval.c
+--- mksh.orig/eval.c	2016-08-01 21:38:27.000000000 +0000
++++ mksh/eval.c	2016-08-18 06:51:31.063554000 +0000
+@@ -972,6 +972,7 @@ expand(
  				switch (c) {
  				case '[':
  				case '!':
@@ -9,10 +21,10 @@ diff -ur mksh-40.org//eval.c mksh-40/eval.c
  				case '-':
  				case ']':
  					/*
-diff -ur mksh-40.org//misc.c mksh-40/misc.c
---- mksh-40.org//misc.c	2011-06-12 16:45:58.000000000 +0200
-+++ mksh-40/misc.c	2011-07-07 18:28:39.015826686 +0200
-@@ -843,7 +843,7 @@
+diff -urp mksh.orig/misc.c mksh/misc.c
+--- mksh.orig/misc.c	2016-08-01 18:43:08.000000000 +0000
++++ mksh/misc.c	2016-08-18 06:51:31.064554000 +0000
+@@ -902,7 +902,7 @@ gmatch_cclass(const unsigned char *p, un
  	bool notp, found = false;
  	const unsigned char *orig_p = p;
  
@@ -21,25 +33,14 @@ diff -ur mksh-40.org//misc.c mksh-40/misc.c
  		p++;
  	do {
  		c = *p++;
-diff -ur mksh-40.org//sh.h mksh-40/sh.h
---- mksh-40.org//sh.h	2011-06-12 16:59:09.000000000 +0200
-+++ mksh-40/sh.h	2011-07-07 18:29:16.346761511 +0200
-@@ -380,5 +380,6 @@
+diff -urp mksh.orig/sh.h mksh/sh.h
+--- mksh.orig/sh.h	2016-08-12 16:48:31.000000000 +0000
++++ mksh/sh.h	2016-08-18 06:51:31.066554000 +0000
+@@ -501,6 +501,7 @@ extern int __cdecl setegid(gid_t);
+  */
  #define MAGIC		(7)	/* prefix for *?[!{,} during expand */
  #define ISMAGIC(c)	((unsigned char)(c) == MAGIC)
 +#define NOT2		'^'
  
- #define LINE		4096	/* input line size */
+ EXTERN const char *safe_prompt; /* safe prompt if PS1 substitution fails */
  
-diff -ur mksh-40.org//tree.c mksh-40/tree.c
---- mksh-40.org//tree.c	2011-05-29 04:19:21.000000000 +0200
-+++ mksh-40/tree.c	2011-07-07 18:30:12.088149284 +0200
-@@ -289,7 +289,7 @@
- 		case CHAR:
- 			c = *wp++;
- 			if ((opmode & WDS_MAGIC) &&
--			    (ISMAGIC(c) || c == '[' || c == '!' ||
-+			    (ISMAGIC(c) || c == '[' || c == '!' || c == NOT2 ||
- 			    c == '-' || c == ']' || c == '*' || c == '?'))
- 				shf_putc(MAGIC, shf);
- 			shf_putc(c, shf);