X-Git-Url: https://git.tld-linux.org/?p=packages%2Fmksh.git;a=blobdiff_plain;f=mksh-circumflex.patch;h=43b7804296eb51a42b34a9eb44bd4b12cd0e002d;hp=97ddc42feb9186673efc120862a8c4bc94be383f;hb=70294de0af805c0733808b7b30e3eb14ff7a7688;hpb=125716db53e31d1a8e097a8fe7ffad1ee8bd9146

diff --git a/mksh-circumflex.patch b/mksh-circumflex.patch
index 97ddc42..43b7804 100644
--- a/mksh-circumflex.patch
+++ b/mksh-circumflex.patch
@@ -1,46 +1,47 @@
-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
+diff -ur mksh.orig/check.t mksh/check.t
+--- mksh.orig/check.t	2020-10-31 04:53:30.000000000 +0100
++++ mksh/check.t	2021-01-18 19:12:47.413180226 +0100
+@@ -2484,7 +2484,7 @@
+ 	!bc +bc ,bc 0bc 1bc ^bc cbc
+ 	!bc +bc ,bc -bc 0bc 1bc ^bc cbc
  	abc bbc
 -	^bc abc bbc
-+	!bc -bc ^bc cbc
- 	!bc -bc ^bc cbc
++	!bc +bc ,bc -bc 0bc 1bc ^bc cbc
+ 	+bc ,bc -bc
+ 	-bc 0bc 1bc
  ---
- 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 '!':
-+				case NOT2:
- 				case '-':
- 				case ']':
+diff -ur mksh.orig/eval.c mksh/eval.c
+--- mksh.orig/eval.c	2020-05-05 23:34:54.000000000 +0200
++++ mksh/eval.c	2021-01-18 19:12:47.411180226 +0100
+@@ -1108,6 +1108,7 @@
+ 				switch (ord(c)) {
+ 				case ORD('['):
+ 				case ORD('!'):
++				case ORD(NOT2):
+ 				case ORD('-'):
+ 				case ORD(']'):
  					/*
-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;
+diff -ur mksh.orig/misc.c mksh/misc.c
+--- mksh.orig/misc.c	2020-08-27 21:53:12.000000000 +0200
++++ mksh/misc.c	2021-01-18 19:12:47.411180226 +0100
+@@ -1018,7 +1018,7 @@
+ 	char *subp;
  
--	if ((notp = tobool(ISMAGIC(*p) && *++p == '!')))
-+	if ((notp = tobool(ISMAGIC(*p) && (*++p == '!' || *p == NOT2))))
- 		p++;
- 	do {
- 		c = *p++;
-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);
+ 	/* check for negation */
+-	if (ISMAGIC(p[0]) && ord(p[1]) == ORD('!')) {
++	if (ISMAGIC(p[0]) && (ord(p[1]) == ORD('!') || ord(p[1]) == ORD(NOT2))) {
+ 		p += 2;
+ 		negated = true;
+ 	}
+diff -ur mksh.orig/sh.h mksh/sh.h
+--- mksh.orig/sh.h	2020-10-31 04:53:33.000000000 +0100
++++ mksh/sh.h	2021-01-18 19:12:47.412180226 +0100
+@@ -580,6 +580,7 @@
   */
- #define MAGIC		(7)	/* prefix for *?[!{,} during expand */
- #define ISMAGIC(c)	((unsigned char)(c) == MAGIC)
+ #define MAGIC		KSH_BEL	/* prefix for *?[!{,} during expand */
+ #define ISMAGIC(c)	(ord(c) == ORD(MAGIC))
 +#define NOT2		'^'
  
  EXTERN const char *safe_prompt; /* safe prompt if PS1 substitution fails */
  
+Only in mksh: sh.h.orig