diff options
| author |   Martin Väth <martin@mvath.de> | 2016-07-30 19:33:03 +0200 |
|---|---|---|
| committer | Martin Väth <martin@mvath.de> | 2016-07-30 19:33:03 +0200 |
| commit | 3f0f3aa67d15bbc27c00137ef59523c755252cbb (patch) | |
| tree | 24cf9fb93eb6d238b4457b3727049e27b07fb65b /app-shells/schily-tools/files | |
| parent | www-plugins/noscript: Version bump (diff) | |
| download | mv-3f0f3aa67d15bbc27c00137ef59523c755252cbb.tar.gz mv-3f0f3aa67d15bbc27c00137ef59523c755252cbb.tar.bz2 mv-3f0f3aa67d15bbc27c00137ef59523c755252cbb.zip | |
app-shells/schily-tools: Use upstream patches
Diffstat (limited to 'app-shells/schily-tools/files')
| -rw-r--r-- | app-shells/schily-tools/files/fix_read.patch | 25 | ||||
| -rw-r--r-- | app-shells/schily-tools/files/setuarg.patch | 27 | ||||
| -rw-r--r-- | app-shells/schily-tools/files/testeq.patch | 11 |
3 files changed, 0 insertions, 63 deletions
diff --git a/app-shells/schily-tools/files/fix_read.patch b/app-shells/schily-tools/files/fix_read.patch deleted file mode 100644 index 5d1e2f08..00000000 --- a/app-shells/schily-tools/files/fix_read.patch +++ /dev/null @@ -1,25 +0,0 @@ -# Fix "read a" (with one variable) in bosh ---- 1/sh/name.c -+++ 1/sh/name.c -@@ -527,7 +527,7 @@ - else if (ch == 'r') - nextwchar = readwc; - } -- namec -= optv.optind; -+ namec -= --optv.optind; - names += optv.optind; - } - -@@ -535,10 +535,9 @@ - a[0] = UC repname; - a[1] = NULL; - names = a; -- } --#else -- names++; -+ } else - #endif -+ names++; - ifs = ifsnod.namval; - if (ifs == NULL) - ifs = (unsigned char *)sptbnl; diff --git a/app-shells/schily-tools/files/setuarg.patch b/app-shells/schily-tools/files/setuarg.patch deleted file mode 100644 index 46ce6ec2..00000000 --- a/app-shells/schily-tools/files/setuarg.patch +++ /dev/null @@ -1,27 +0,0 @@ ---- 1/sh/macro.c -+++ 1/sh/macro.c -@@ -322,6 +322,7 @@ - if ((c = readwc(), dolchar(c))) { - struct namnod *n = (struct namnod *)NIL; - int dolg = 0; -+ int isg = 1; - int vsize = -1; - BOOL bra; - BOOL nulflg; -@@ -362,6 +363,7 @@ - atflag = 1; - } - dolg = 1; -+ isg++; - c = 1; - } else if (digit(c)) { - c -= '0'; -@@ -622,7 +624,7 @@ - error(badsub); - } - } -- } else if (flags & setflg) { -+ } else if ((flags & setflg) && isg == 0) { - failed(id, unset); - } - goto retry; diff --git a/app-shells/schily-tools/files/testeq.patch b/app-shells/schily-tools/files/testeq.patch deleted file mode 100644 index 22c374e2..00000000 --- a/app-shells/schily-tools/files/testeq.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- 1/sh/test.c -+++ 1/sh/test.c -@@ -614,7 +614,7 @@ - Intmax_t ll_1 = 0; /* Avoid warning from silly GCC */ - Intmax_t ll_2 = 0; /* Avoid warning from silly GCC */ - -- if (op > TEST_EQ) { -+ if (op >= TEST_EQ) { - ll_1 = str2imax(arg1); - ll_2 = str2imax(arg2); - } |