diff options
| author | Ruslan Ermilov <ru@FreeBSD.org> | 2011-08-11 10:29:10 +0000 |
|---|---|---|
| committer | Ruslan Ermilov <ru@FreeBSD.org> | 2011-08-11 10:29:10 +0000 |
| commit | aa0da2e494780a0d64f823ed789c2fa207070144 (patch) | |
| tree | a20eea0c5240ad883ee6167ee612a5e57b625a9e | |
| parent | 223eb00dd0f32465483e33a012797bad963e971b (diff) | |
| parent | b0f5e94e3f34717e78a265dc61c6c45406a258d0 (diff) | |
Notes
| -rw-r--r-- | Makefile.inc1 | 5 | ||||
| -rw-r--r-- | contrib/one-true-awk/FIXES | 4 | ||||
| -rw-r--r-- | contrib/one-true-awk/lib.c | 9 | ||||
| -rw-r--r-- | contrib/one-true-awk/main.c | 2 |
4 files changed, 17 insertions, 3 deletions
diff --git a/Makefile.inc1 b/Makefile.inc1 index 7fdce3628b9b0..7228f859ce253 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -1014,6 +1014,10 @@ _lex= usr.bin/lex _yacc= usr.bin/yacc .endif +.if ${BOOTSTRAPPING} >= 900040 && ${BOOTSTRAPPING} < 900041 +_awk= usr.bin/awk +.endif + .if ${BOOTSTRAPPING} < 700018 _gensnmptree= usr.sbin/bsnmpd/gensnmptree .endif @@ -1052,6 +1056,7 @@ bootstrap-tools: ${_groff} \ ${_ar} \ ${_dtc} \ + ${_awk} \ usr.bin/lorder \ usr.bin/makewhatis \ ${_mklocale} \ diff --git a/contrib/one-true-awk/FIXES b/contrib/one-true-awk/FIXES index a802ad418783b..a708027461ce5 100644 --- a/contrib/one-true-awk/FIXES +++ b/contrib/one-true-awk/FIXES @@ -25,6 +25,10 @@ THIS SOFTWARE. This file lists all bug fixes, changes, etc., made since the AWK book was sent to the printers in August, 1987. +Aug 10, 2011: + another fix to avoid core dump with delete(ARGV); again, many thanks + to ruslan ermilov. + Aug 7, 2011: split(s, a, //) now behaves the same as split(s, a, "") diff --git a/contrib/one-true-awk/lib.c b/contrib/one-true-awk/lib.c index 5da601aa8e7ed..5eeb53d4679db 100644 --- a/contrib/one-true-awk/lib.c +++ b/contrib/one-true-awk/lib.c @@ -89,8 +89,13 @@ void initgetrec(void) char *p; for (i = 1; i < *ARGC; i++) { - if (!isclvar(p = getargv(i))) { /* find 1st real filename */ - setsval(lookup("FILENAME", symtab), getargv(i)); + p = getargv(i); /* find 1st real filename */ + if (p == NULL || *p == '\0') { /* deleted or zapped */ + argno++; + continue; + } + if (!isclvar(p)) { + setsval(lookup("FILENAME", symtab), p); return; } setclvar(p); /* a commandline assignment before filename */ diff --git a/contrib/one-true-awk/main.c b/contrib/one-true-awk/main.c index 61063b13c9c4d..8cc70573afd73 100644 --- a/contrib/one-true-awk/main.c +++ b/contrib/one-true-awk/main.c @@ -25,7 +25,7 @@ THIS SOFTWARE. #include <sys/cdefs.h> __FBSDID("$FreeBSD$"); -const char *version = "version 20110807 (FreeBSD)"; +const char *version = "version 20110810 (FreeBSD)"; #define DEBUG #include <stdio.h> |