aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRuslan Ermilov <ru@FreeBSD.org>2010-01-09 23:04:24 +0000
committerRuslan Ermilov <ru@FreeBSD.org>2010-01-09 23:04:24 +0000
commitd9859a0e4b8744c01f13cf391ee5cfbf57c5e818 (patch)
tree9c534258e481a3cc70a8d7e2e44f6726fd042d76
parent2f77d6040739b460e8f831f9d86510505ad8ed75 (diff)
downloadsrc-d9859a0e4b8744c01f13cf391ee5cfbf57c5e818.tar.gz
src-d9859a0e4b8744c01f13cf391ee5cfbf57c5e818.zip
Vendor import of bwk's 26-Nov-2009 release.vendor/one-true-awk/20091126
Notes
Notes: svn path=/vendor/one-true-awk/dist/; revision=201945 svn path=/vendor/one-true-awk/20091126/; revision=201946; tag=vendor/one-true-awk/20091126
-rw-r--r--FIXES17
-rw-r--r--b.c3
-rw-r--r--lib.c1
-rw-r--r--main.c2
-rw-r--r--makefile1
-rw-r--r--maketab.c2
-rw-r--r--proctab.c2
-rw-r--r--proto.h2
-rw-r--r--run.c4
9 files changed, 26 insertions, 8 deletions
diff --git a/FIXES b/FIXES
index 2f39d4827c10..bda79768606a 100644
--- a/FIXES
+++ b/FIXES
@@ -25,6 +25,23 @@ THIS SOFTWARE.
This file lists all bug fixes, changes, etc., made since the AWK book
was sent to the printers in August, 1987.
+Nov 26, 2009:
+ fixed a long-standing issue with when FS takes effect. a
+ change to FS is now noticed immediately for subsequent splits.
+
+ changed the name getline() to awkgetline() to avoid yet another
+ name conflict somewhere.
+
+Feb 11, 2009:
+ temporarily for now defined HAS_ISBLANK, since that seems to
+ be the best way through the thicket. isblank arrived in C99,
+ but seems to be arriving at different systems at different
+ times.
+
+Oct 8, 2008:
+ fixed typo in b.c that set tmpvec wrongly. no one had ever
+ run into the problem, apparently. thanks to alistair crooks.
+
Oct 23, 2007:
minor fix in lib.c: increase inputFS to 100, change malloc
for fields to n+1.
diff --git a/b.c b/b.c
index 0d91f23f548c..4c6d61be9082 100644
--- a/b.c
+++ b/b.c
@@ -731,6 +731,7 @@ Node *unary(Node *np)
* to nelson beebe for the suggestion; let's see if it works everywhere.
*/
+/* #define HAS_ISBLANK */
#ifndef HAS_ISBLANK
int (isblank)(int c)
@@ -876,7 +877,7 @@ int cgoto(fa *f, int s, int c)
if (q[j] >= maxsetvec) {
maxsetvec *= 4;
setvec = (int *) realloc(setvec, maxsetvec * sizeof(int));
- tmpset = (int *) realloc(setvec, maxsetvec * sizeof(int));
+ tmpset = (int *) realloc(tmpset, maxsetvec * sizeof(int));
if (setvec == 0 || tmpset == 0)
overflo("cgoto overflow");
}
diff --git a/lib.c b/lib.c
index c9cc5d563b16..017b37670d07 100644
--- a/lib.c
+++ b/lib.c
@@ -274,6 +274,7 @@ void fldbld(void) /* create fields from current record */
}
fr = fields;
i = 0; /* number of fields accumulated here */
+ strcpy(inputFS, *FS);
if (strlen(inputFS) > 1) { /* it's a regular expression */
i = refldbld(r, inputFS);
} else if ((sep = *inputFS) == ' ') { /* default whitespace */
diff --git a/main.c b/main.c
index e1ed1773e09b..3bc25a579fec 100644
--- a/main.c
+++ b/main.c
@@ -22,7 +22,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF
THIS SOFTWARE.
****************************************************************/
-const char *version = "version 20070501";
+const char *version = "version 20091126";
#define DEBUG
#include <stdio.h>
diff --git a/makefile b/makefile
index a761a594d894..9d3985be2d4c 100644
--- a/makefile
+++ b/makefile
@@ -31,7 +31,6 @@ CC = gcc -fprofile-arcs -ftest-coverage # then gcov f1.c; cat f1.c.gcov
CC = gcc -Wall -g
CC = cc
CC = gcc -O4
-CC = gcc -Wall -g
YACC = bison -y
diff --git a/maketab.c b/maketab.c
index 1f78a9eb9220..31acd7522da5 100644
--- a/maketab.c
+++ b/maketab.c
@@ -102,7 +102,7 @@ struct xx
{ CALL, "call", "call" },
{ ARG, "arg", "arg" },
{ VARNF, "getnf", "NF" },
- { GETLINE, "getline", "getline" },
+ { GETLINE, "awkgetline", "getline" },
{ 0, "", "" },
};
diff --git a/proctab.c b/proctab.c
index 401dec635d90..e4eddfda92d1 100644
--- a/proctab.c
+++ b/proctab.c
@@ -180,7 +180,7 @@ Cell *(*proctab[93])(Node **, int) = {
nullproc, /* NUMBER */
nullproc, /* STRING */
nullproc, /* REGEXPR */
- getline, /* GETLINE */
+ awkgetline, /* GETLINE */
substr, /* SUBSTR */
split, /* SPLIT */
jump, /* RETURN */
diff --git a/proto.h b/proto.h
index adda07108c8c..0a68b3a813f8 100644
--- a/proto.h
+++ b/proto.h
@@ -149,7 +149,7 @@ extern Cell *call(Node **, int);
extern Cell *copycell(Cell *);
extern Cell *arg(Node **, int);
extern Cell *jump(Node **, int);
-extern Cell *getline(Node **, int);
+extern Cell *awkgetline(Node **, int);
extern Cell *getnf(Node **, int);
extern Cell *array(Node **, int);
extern Cell *awkdelete(Node **, int);
diff --git a/run.c b/run.c
index a9e269cc7155..72fc4d0f4172 100644
--- a/run.c
+++ b/run.c
@@ -388,7 +388,7 @@ Cell *jump(Node **a, int n) /* break, continue, next, nextfile, return */
return 0; /* not reached */
}
-Cell *getline(Node **a, int n) /* get next line from specific input */
+Cell *awkgetline(Node **a, int n) /* get next line from specific input */
{ /* a[0] is variable, a[1] is operator, a[2] is filename */
Cell *r, *x;
extern Cell **fldtab;
@@ -1159,11 +1159,11 @@ Cell *cat(Node **a, int q) /* a[0] cat a[1] */
x->sval, y->sval);
strcpy(s, x->sval);
strcpy(s+n1, y->sval);
+ tempfree(x);
tempfree(y);
z = gettemp();
z->sval = s;
z->tval = STR;
- tempfree(x);
return(z);
}