summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Forney <mforney@mforney.org>2016-12-11 00:55:12 -0800
committerMichael Forney <mforney@mforney.org>2016-12-11 00:55:12 -0800
commit7ef07104f29604375f81f5136ba3af08a8e1aded (patch)
tree3ec26df9c3366f7c9b0aae5997f1cdfb700ad0a1
parent602221aabed6e095d2bc0a0193db543a85710da6 (diff)
awk: Add patch to fix generating array with too many elements
-rw-r--r--.gitmodules1
-rw-r--r--core/awk/patch/0001-maketab-Only-consider-define-lines-that-match-the-ex.patch26
-rw-r--r--core/awk/rev2
3 files changed, 28 insertions, 1 deletions
diff --git a/.gitmodules b/.gitmodules
index 8cff289e..12381d46 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,6 +1,7 @@
[submodule "core/awk/src"]
path = core/awk/src
url = https://github.com/onetrueawk/awk
+ ignore = all
[submodule "core/curl/src"]
path = core/curl/src
url = https://github.com/curl/curl
diff --git a/core/awk/patch/0001-maketab-Only-consider-define-lines-that-match-the-ex.patch b/core/awk/patch/0001-maketab-Only-consider-define-lines-that-match-the-ex.patch
new file mode 100644
index 00000000..cf62346a
--- /dev/null
+++ b/core/awk/patch/0001-maketab-Only-consider-define-lines-that-match-the-ex.patch
@@ -0,0 +1,26 @@
+From dd4904dd150f9dfa2c3ca0392d6870c85fc14c26 Mon Sep 17 00:00:00 2001
+From: Michael Forney <mforney@mforney.org>
+Date: Sat, 10 Dec 2016 19:57:39 -0800
+Subject: [PATCH] maketab: Only consider #define lines that match the expected
+ form
+
+---
+ maketab.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/maketab.c b/maketab.c
+index 31acd75..63208c8 100644
+--- a/maketab.c
++++ b/maketab.c
+@@ -132,7 +132,7 @@ int main(int argc, char *argv[])
+ i = 0;
+ while (fgets(buf, sizeof buf, fp) != NULL) {
+ n = sscanf(buf, "%1c %s %s %d", &c, def, name, &tok);
+- if (c != '#' || (n != 4 && strcmp(def,"define") != 0)) /* not a valid #define */
++ if (c != '#' || n != 4 || strcmp(def,"define") != 0) /* not a valid #define */
+ continue;
+ if (tok < FIRSTTOKEN || tok > LASTTOKEN) {
+ /* fprintf(stderr, "maketab funny token %d %s ignored\n", tok, buf); */
+--
+2.11.0
+
diff --git a/core/awk/rev b/core/awk/rev
index d00491fd..0cfbf088 100644
--- a/core/awk/rev
+++ b/core/awk/rev
@@ -1 +1 @@
-1
+2