mirror of
https://github.com/freebsd/freebsd-src
synced 2024-07-21 18:27:22 +00:00
2e406c584f
This is a rollup of a lot of changes. In summary, lots of bug fixes,
Unicode support and CSV support to match the 2nd Edition of the Awk
Book.
In detail, from AWK's FIXES and FIXES.1e:
From FIXES:
Oct 30, 2023:
multiple fixes and a minor code cleanup.
disabled utf-8 for non-multibyte locales, such as C or POSIX.
fixed a bad char * cast that causes incorrect results on big-endian
systems. also fixed an out-of-bounds read for empty CCL.
fixed a buffer overflow in substr with utf-8 strings.
many thanks to Todd C Miller.
Sep 24, 2023:
fnematch and getrune have been overhauled to solve issues around
unicode FS and RS. also fixed gsub null match issue with unicode.
big thanks to Arnold Robbins.
Sep 12, 2023:
Fixed a length error in u8_byte2char that set RSTART to
incorrect (cannot happen) value for EOL match(str, /$/).
-----------------------------------------------------------------
[This entry is a summary, not a precise list of changes.]
Added --csv option to enable processing of comma-separated
values inputs. When --csv is enabled, fields are separated
by commas, fields may be quoted with " double quotes, fields
may contain embedded newlines.
If no explicit separator argument is provided, split() uses
the setting of --csv to determine how fields are split.
Strings may now contain UTF-8 code points (not necessarily
characters). Functions that operate on characters, like
length, substr, index, match, etc., use UTF-8, so the length
of a string of 3 emojis is 3, not 12 as it would be if bytes
were counted.
Regular expressions are processes as UTF-8.
Unicode literals can be written as \u followed by one
to eight hexadecimal digits. These may appear in strings and
regular expressions.
From FIXES.1e:
Sep 06, 2023:
Fix edge case where FS is changed on commandline. Thanks to
Gordon Shephard and Miguel Pineiro Jr.
Fix regular expression clobbering in the lexer, where lexer does
not make a copy of regexp literals. also makedfa memory leaks have
been plugged. Thanks to Miguel Pineiro Jr.
Dec 15, 2022:
Force hex escapes in strings to be no more than two characters,
as they already are in regular expressions. This brings internal
consistency, as well as consistency with gawk. Thanks to
Arnold Robbins.
Sep 12, 2022:
adjbuf minlen error (cannot be 0) in cat, resulting in NULL pbuf.
discovered by todd miller. also use-after-free issue with
tempfree in cat, thanks to Miguel Pineiro Jr and valgrind.
Aug 30, 2022:
Various leaks and use-after-free issues plugged/fixed.
Thanks to Miguel Pineiro Jr. <mpj@pineiro.cc>.
May 23, 2022:
Memory leak when assigning a string to some of the built-in
variables. allocated string erroneously marked DONTFREE.
Thanks to Miguel Pineiro Jr. <mpj@pineiro.cc>.
Mar 14, 2022:
Historic bug: command-line "name=value" assignment had been
truncating its entry in ARGV. (circa 1989) Thanks to
Miguel Pineiro Jr. <mpj@pineiro.cc>.
Mar 3, 2022:
Fixed file management memory leak that appears to have been
there since the files array was first initialized with stdin,
stdout, and stderr (circa 1992). Thanks to Miguel Pineiro Jr.
<mpj@pineiro.cc>.
December 8, 2021:
The error handling in closefile and closeall was mangled. Long
standing warnings had been made fatal and some fatal errors went
undetected. Thanks to Miguel Pineiro Jr. <mpj@pineiro.cc>.
Nov 03, 2021:
getline accesses uninitialized data after getrec()
returns 0 on EOF and leaves the contents of buf unchanged.
Thanks to Volodymyr Gubarkov, and Todd C Miller.
Oct 12, 2021:
The fix for #83 changed the code to insert 2 chars, but the
call to adjbuf just above it only allows for 1 char. This can
cause a heap buffer overflow.
Sponsored by: Netflix
113 lines
3.5 KiB
Makefile
113 lines
3.5 KiB
Makefile
# /****************************************************************
|
|
# Copyright (C) Lucent Technologies 1997
|
|
# All Rights Reserved
|
|
#
|
|
# Permission to use, copy, modify, and distribute this software and
|
|
# its documentation for any purpose and without fee is hereby
|
|
# granted, provided that the above copyright notice appear in all
|
|
# copies and that both that the copyright notice and this
|
|
# permission notice and warranty disclaimer appear in supporting
|
|
# documentation, and that the name Lucent Technologies or any of
|
|
# its entities not be used in advertising or publicity pertaining
|
|
# to distribution of the software without specific, written prior
|
|
# permission.
|
|
#
|
|
# LUCENT DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
|
|
# INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS.
|
|
# IN NO EVENT SHALL LUCENT OR ANY OF ITS ENTITIES BE LIABLE FOR ANY
|
|
# SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
|
|
# WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER
|
|
# IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,
|
|
# ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF
|
|
# THIS SOFTWARE.
|
|
# ****************************************************************/
|
|
|
|
CFLAGS = -fsanitize=address -O1 -g -fno-omit-frame-pointer -fno-optimize-sibling-calls
|
|
CFLAGS = -g
|
|
CFLAGS =
|
|
CFLAGS = -O2
|
|
|
|
# compiler options
|
|
#CC = gcc -Wall -g -Wwrite-strings
|
|
#CC = gcc -O4 -Wall -pedantic -fno-strict-aliasing
|
|
#CC = gcc -fprofile-arcs -ftest-coverage # then gcov f1.c; cat f1.c.gcov
|
|
HOSTCC = gcc -g -Wall -pedantic -Wcast-qual
|
|
CC = $(HOSTCC) # change this is cross-compiling.
|
|
|
|
# By fiat, to make our lives easier, yacc is now defined to be bison.
|
|
# If you want something else, you're on your own.
|
|
# YACC = yacc -d -b awkgram
|
|
YACC = bison -d
|
|
|
|
OFILES = b.o main.o parse.o proctab.o tran.o lib.o run.o lex.o
|
|
|
|
SOURCE = awk.h awkgram.tab.c awkgram.tab.h proto.h awkgram.y lex.c b.c main.c \
|
|
maketab.c parse.c lib.c run.c tran.c proctab.c
|
|
|
|
LISTING = awk.h proto.h awkgram.y lex.c b.c main.c maketab.c parse.c \
|
|
lib.c run.c tran.c
|
|
|
|
SHIP = README LICENSE FIXES $(SOURCE) awkgram.tab.[ch].bak makefile \
|
|
awk.1
|
|
|
|
a.out: awkgram.tab.o $(OFILES)
|
|
$(CC) $(CFLAGS) awkgram.tab.o $(OFILES) $(ALLOC) -lm
|
|
|
|
$(OFILES): awk.h awkgram.tab.h proto.h
|
|
|
|
awkgram.tab.c awkgram.tab.h: awk.h proto.h awkgram.y
|
|
$(YACC) $(YFLAGS) awkgram.y
|
|
|
|
proctab.c: maketab
|
|
./maketab awkgram.tab.h >proctab.c
|
|
|
|
maketab: awkgram.tab.h maketab.c
|
|
$(HOSTCC) $(CFLAGS) maketab.c -o maketab
|
|
|
|
bundle:
|
|
@cp awkgram.tab.h awkgram.tab.h.bak
|
|
@cp awkgram.tab.c awkgram.tab.c.bak
|
|
@bundle $(SHIP)
|
|
|
|
tar:
|
|
@cp awkgram.tab.h awkgram.tab.h.bak
|
|
@cp awkgram.tab.c awkgram.tab.c.bak
|
|
@bundle $(SHIP) >awk.shar
|
|
@tar cf awk.tar $(SHIP)
|
|
gzip awk.tar
|
|
ls -l awk.tar.gz
|
|
@zip awk.zip $(SHIP)
|
|
ls -l awk.zip
|
|
|
|
gitadd:
|
|
git add README LICENSE FIXES \
|
|
awk.h proto.h awkgram.y lex.c b.c main.c maketab.c parse.c \
|
|
lib.c run.c tran.c \
|
|
makefile awk.1 testdir
|
|
|
|
gitpush:
|
|
# only do this once:
|
|
# git remote add origin https://github.com/onetrueawk/awk.git
|
|
git push -u origin master
|
|
|
|
names:
|
|
@echo $(LISTING)
|
|
|
|
test check:
|
|
./REGRESS
|
|
|
|
clean: testclean
|
|
rm -f a.out *.o *.obj maketab maketab.exe *.bb *.bbg *.da *.gcov *.gcno *.gcda # proctab.c
|
|
|
|
cleaner: testclean
|
|
rm -f a.out *.o *.obj maketab maketab.exe *.bb *.bbg *.da *.gcov *.gcno *.gcda proctab.c awkgram.tab.*
|
|
|
|
# This is a bit of a band-aid until we can invest some more time
|
|
# in the test suite.
|
|
testclean:
|
|
cd testdir; rm -fr arnold-fixes beebe devnull echo foo* \
|
|
glop glop1 glop2 lilly.diff tempbig tempsmall time
|
|
|
|
# For the habits of GNU maintainers:
|
|
distclean: cleaner
|