X-Git-Url: http://git.pld-linux.org/gitweb.cgi?a=blobdiff_plain;f=mksh-circumflex.patch;h=8533e44a0ae71b50dc4ca4893ad55454083f6cca;hb=e054616e3acc1a52b937fd8e50094039cd032669;hp=62139e44ab0967d27c8a557dfce9fcc27365c741;hpb=cdde4aaee97a971ef322ef866b1f34b651ce6189;p=packages%2Fmksh.git

diff --git a/mksh-circumflex.patch b/mksh-circumflex.patch
index 62139e4..8533e44 100644
--- a/mksh-circumflex.patch
+++ b/mksh-circumflex.patch
@@ -12,21 +12,12 @@ diff -ur mksh-40.org//eval.c mksh-40/eval.c
 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
-@@ -652,7 +652,7 @@
- 			if (!in_bracket) {
- 				saw_glob = true;
- 				in_bracket = true;
--				if (ISMAGIC(p[1]) && p[2] == '!')
-+				if (ISMAGIC(p[1]) && (p[2] == '!' || p[2] == NOT2))
- 					p += 2;
- 				if (ISMAGIC(p[1]) && p[2] == ']')
- 					p += 2;
-@@ -831,7 +831,7 @@
- 	int c, d, notp, found = 0;
+@@ -843,7 +843,7 @@
+ 	bool notp, found = false;
  	const unsigned char *orig_p = p;
  
--	if ((notp = (ISMAGIC(*p) && *++p == '!')))
-+	if ((notp = (ISMAGIC(*p) && (*++p == '!' || *p == NOT2))))
+-	if ((notp = tobool(ISMAGIC(*p) && *++p == '!')))
++	if ((notp = tobool(ISMAGIC(*p) && (*++p == '!' || *p == NOT2))))
  		p++;
  	do {
  		c = *p++;
@@ -52,3 +43,15 @@ diff -ur mksh-40.org//tree.c mksh-40/tree.c
  			    c == '-' || c == ']' || c == '*' || c == '?'))
  				shf_putc(MAGIC, shf);
  			shf_putc(c, shf);
+diff -urN mksh.org/check.t mksh/check.t
+--- mksh.org/check.t	2014-01-11 19:10:02.000000000 +0100
++++ mksh/check.t	2014-01-20 14:12:37.924222697 +0100
+@@ -2085,7 +2085,7 @@
+ 	cbc
+ 	-bc cbc
+ 	abc bbc
+-	^bc abc bbc
++	!bc -bc ^bc cbc
+ 	!bc -bc ^bc cbc
+ ---
+ name: glob-range-2