up to 50f

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

diff --git a/mksh-circumflex.patch b/mksh-circumflex.patch
index 0952788782a85122852dbf5c9b5799206da3bd63..8533e44a0ae71b50dc4ca4893ad55454083f6cca 100644 (file)
--- a/mksh-circumflex.patch
+++ b/mksh-circumflex.patch
@@ -4,7 +4,7 @@ diff -ur mksh-40.org//eval.c mksh-40/eval.c
 @@ -887,6 +887,7 @@
                                switch (c) {
                                case '[':
-                               case NOT:
+                               case '!':
 +                              case NOT2:
                                case '-':
                                case ']':
@@ -12,31 +12,21 @@ 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] == NOT)
-+                              if (ISMAGIC(p[1]) && (p[2] == NOT || 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 == NOT)))
-+      if ((notp = (ISMAGIC(*p) && (*++p == NOT || *p == NOT2))))
+-      if ((notp = tobool(ISMAGIC(*p) && *++p == '!')))
++      if ((notp = tobool(ISMAGIC(*p) && (*++p == '!' || *p == NOT2))))
                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,6 +380,7 @@
+@@ -380,5 +380,6 @@
  #define MAGIC         (7)     /* prefix for *?[!{,} during expand */
  #define ISMAGIC(c)    ((unsigned char)(c) == MAGIC)
- #define NOT           '!'     /* might use ^ (ie, [!...] vs [^..]) */
 +#define NOT2          '^'
  
  #define LINE          4096    /* input line size */
@@ -48,8 +38,20 @@ diff -ur mksh-40.org//tree.c mksh-40/tree.c
                case CHAR:
                        c = *wp++;
                        if ((opmode & WDS_MAGIC) &&
--                          (ISMAGIC(c) || c == '[' || c == NOT ||
-+                          (ISMAGIC(c) || c == '[' || c == NOT || c == NOT2 ||
+-                          (ISMAGIC(c) || c == '[' || c == '!' ||
++                          (ISMAGIC(c) || c == '[' || c == '!' || c == NOT2 ||
                            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