X-Git-Url: https://git.tld-linux.org/?p=packages%2Fmksh.git;a=blobdiff_plain;f=mksh-circumflex.patch;h=36ad8179be415aaaf947633c2a772b54b4e19bcb;hp=97ddc42feb9186673efc120862a8c4bc94be383f;hb=5d2aaac0ec9c2baab91727d8d2caf6d37db4e4d2;hpb=125716db53e31d1a8e097a8fe7ffad1ee8bd9146 diff --git a/mksh-circumflex.patch b/mksh-circumflex.patch index 97ddc42..36ad817 100644 --- a/mksh-circumflex.patch +++ b/mksh-circumflex.patch @@ -1,46 +1,46 @@ -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 '!': -+ case NOT2: - case '-': - case ']': +diff -ur mksh-56.orig/eval.c mksh-56/eval.c +--- mksh-56.orig/eval.c 2017-08-12 22:10:26.321676398 +0200 ++++ mksh-56/eval.c 2017-08-12 22:40:32.672676143 +0200 +@@ -1005,6 +1005,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-56.orig/misc.c mksh-56/misc.c +--- mksh-56.orig/misc.c 2017-08-12 22:10:26.321676398 +0200 ++++ mksh-56/misc.c 2017-08-12 22:40:32.672676143 +0200 +@@ -966,7 +966,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-56.orig/sh.h mksh-56/sh.h +--- mksh-56.orig/sh.h 2017-08-12 22:10:26.325009789 +0200 ++++ mksh-56/sh.h 2017-08-12 22:40:32.696009488 +0200 +@@ -550,6 +550,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 */ +diff -ur mksh-56.orig/check.t mksh-56/check.t +--- mksh-56.orig/check.t 2017-08-12 22:10:26.321676398 +0200 ++++ mksh-56/check.t 2017-08-12 22:41:46.886083258 +0200 +@@ -2438,7 +2438,7 @@ + !bc +bc ,bc 0bc 1bc ^bc cbc + !bc +bc ,bc -bc 0bc 1bc ^bc cbc + abc bbc +- ^bc abc bbc ++ !bc +bc ,bc -bc 0bc 1bc ^bc cbc + +bc ,bc -bc + -bc 0bc 1bc + ---