Merge tag '1.4' into since

Version 1.4

1 files changed, 283 insertions, 18 deletions

diff --git a/Makefile b/Makefile
index cc1c5c9..1a86fa7 100644
--- a/Makefile
+++ b/Makefile
@@ -3,6 +3,19 @@
 CONFIGFILE = config.mk
 include $(CONFIGFILE)
 
+OS = linux
+# Linux:   linux
+# Mac OS:  macos
+# Windows: windows
+include mk/$(OS).mk
+
+
+LIB_MAJOR = 1
+LIB_MINOR = 4
+LIB_VERSION = $(LIB_MAJOR).$(LIB_MINOR)
+LIB_NAME = simple
+
+
 SUBHDR =\
 	libsimple/aligned_alloc.h\
 	libsimple/aligned_allocz.h\
@@ -32,10 +45,12 @@ SUBHDR =\
 	libsimple/pvalloc.h\
 	libsimple/pvallocz.h\
 	libsimple/realloc.h\
+	libsimple/search.h\
 	libsimple/str.h\
 	libsimple/strdup.h\
 	libsimple/strn.h\
 	libsimple/strndup.h\
+	libsimple/strtoint.h\
 	libsimple/time.h\
 	libsimple/valloc.h\
 	libsimple/vallocz.h\
@@ -45,54 +60,188 @@ SUBHDR =\
 
 HDR =\
 	$(SUBHDR)\
-	libsimple.h
+	libsimple.h\
+	common.h
 
 OBJ =\
+	aligned_allocn.o\
+	aligned_allocz.o\
+	aligned_alloczn.o\
 	aligned_memdup.o\
+	aligned_realloc.o\
+	aligned_reallocarray.o\
+	aligned_reallocarrayf.o\
+	aligned_reallocf.o\
+	aligned_reallocfn.o\
+	aligned_reallocn.o\
+	aligned_strdup.o\
 	aligned_strndup.o\
+	aligned_wcsdup.o\
 	aligned_wcsndup.o\
 	aligned_wmemdup.o\
 	allocn.o\
 	asprintf.o\
+	bindex.o\
+	bindex_r.o\
+	callocn.o\
+	close.o\
+	cmptimespec.o\
+	cmptimeval.o\
 	difftimespec.o\
 	difftimeval.o\
 	doubletotimespec.o\
 	doubletotimeval.o\
+	ealigned_alloc.o\
+	ealigned_allocn.o\
+	ealigned_allocz.o\
+	ealigned_alloczn.o\
+	ealigned_memdup.o\
+	ealigned_realloc.o\
+	ealigned_reallocarray.o\
+	ealigned_reallocn.o\
+	ealigned_strdup.o\
+	ealigned_strndup.o\
+	ealigned_wcsdup.o\
+	ealigned_wcsndup.o\
+	ealigned_wmemdup.o\
+	ecalloc.o\
+	ecallocn.o\
+	egmtime.o\
+	elocaltime.o\
+	emalloc.o\
+	emallocn.o\
+	emallocz.o\
+	emalloczn.o\
+	ememalign.o\
+	ememalignn.o\
+	ememalignz.o\
+	ememalignzn.o\
+	ememalloc.o\
+	ememdup.o\
+	enaligned_alloc.o\
+	enaligned_allocn.o\
 	enaligned_allocz.o\
+	enaligned_alloczn.o\
 	enaligned_memdup.o\
 	enaligned_realloc.o\
 	enaligned_reallocarray.o\
+	enaligned_reallocn.o\
 	enaligned_strdup.o\
 	enaligned_strndup.o\
 	enaligned_wcsdup.o\
 	enaligned_wcsndup.o\
 	enaligned_wmemdup.o\
 	encalloc.o\
+	encallocn.o\
 	engmtime.o\
 	enlocaltime.o\
 	enmalloc.o\
+	enmallocn.o\
+	enmallocz.o\
+	enmalloczn.o\
+	enmemalign.o\
+	enmemalignn.o\
+	enmemalignz.o\
+	enmemalignzn.o\
+	enmemalloc.o\
 	enmemdup.o\
+	enposix_memalign.o\
+	enposix_memalignn.o\
 	enposix_memalignz.o\
+	enposix_memalignzn.o\
+	enprintf.o\
+	enputenvf.o\
+	enpvalloc.o\
+	enpvallocn.o\
+	enpvallocz.o\
+	enpvalloczn.o\
 	enrealloc.o\
 	enreallocarray.o\
+	enreallocn.o\
 	enstrdup.o\
 	enstrndup.o\
+	envaligned_allocn.o\
 	envaligned_alloczn.o\
 	envaligned_reallocn.o\
+	envalloc.o\
+	envallocn.o\
+	envallocz.o\
+	envalloczn.o\
+	envcallocn.o\
+	envmallocn.o\
 	envmalloczn.o\
+	envmemalignn.o\
+	envmemalignzn.o\
 	envmemalloc.o\
+	envposix_memalignn.o\
 	envposix_memalignzn.o\
 	envputenvf.o\
+	envpvallocn.o\
+	envpvalloczn.o\
 	envreallocn.o\
+	envvallocn.o\
+	envvalloczn.o\
 	enwcsdup.o\
 	enwcsndup.o\
 	enwmemdup.o\
+	eposix_memalign.o\
+	eposix_memalignn.o\
+	eposix_memalignz.o\
+	eposix_memalignzn.o\
+	eprintf.o\
+	eputenvf.o\
+	epvalloc.o\
+	epvallocn.o\
+	epvallocz.o\
+	epvalloczn.o\
+	erealloc.o\
+	ereallocarray.o\
+	ereallocn.o\
+	estrdup.o\
+	estrndup.o\
+	evaligned_allocn.o\
+	evaligned_alloczn.o\
+	evaligned_reallocn.o\
+	evalloc.o\
+	evallocn.o\
+	evallocz.o\
+	evalloczn.o\
+	evcallocn.o\
+	evmallocn.o\
+	evmalloczn.o\
+	evmemalignn.o\
+	evmemalignzn.o\
+	evmemalloc.o\
+	evposix_memalignn.o\
+	evposix_memalignzn.o\
+	evputenvf.o\
+	evpvallocn.o\
+	evpvalloczn.o\
+	evreallocn.o\
+	evvallocn.o\
+	evvalloczn.o\
+	ewcsdup.o\
+	ewcsndup.o\
+	ewmemdup.o\
+	getenv_e.o\
+	getenv_ne.o\
 	gmtime.o\
+	inchrcaseset.o\
+	inchrset.o\
 	localtime.o\
+	mallocn.o\
+	mallocz.o\
+	malloczn.o\
+	memalign.o\
+	memalignn.o\
+	memalignz.o\
+	memalignzn.o\
+	memalloc.o\
 	memcasechr.o\
 	memcasechr_inv.o\
 	memcasecmp.o\
 	memcaseends.o\
+	memcaseeq.o\
 	memcaseeqlen.o\
 	memcasemem.o\
 	memcasescan.o\
@@ -108,9 +257,13 @@ OBJ =\
 	memelemscan.o\
 	memelemscan_inv.o\
 	memends.o\
+	memeq.o\
 	memeqlen.o\
 	memisutf8.o\
 	memmem.o\
+	mempcpy.o\
+	mempmove.o\
+	mempset.o\
 	mempsetelem.o\
 	memptolower.o\
 	memptoupper.o\
@@ -122,19 +275,33 @@ OBJ =\
 	memrchr_inv.o\
 	memrelem.o\
 	memrelem_inv.o\
+	memreplace.o\
 	memreplaceelem.o\
 	memreqlen.o\
 	memrmem.o\
 	memscan.o\
 	memscan_inv.o\
+	memsetelem.o\
 	memstarts.o\
+	memtolower.o\
+	memtoupper.o\
 	minimise_number_string.o\
 	multimespec.o\
 	multimeval.o\
+	posix_memalignn.o\
+	posix_memalignz.o\
+	posix_memalignzn.o\
+	putenvf.o\
+	pvalloc.o\
+	pvallocn.o\
+	pvallocz.o\
+	pvalloczn.o\
 	rawmemcasechr.o\
 	rawmemcasechr_inv.o\
+	rawmemccpy.o\
 	rawmemchr.o\
 	rawmemchr_inv.o\
+	rawmemcmove.o\
 	rawmemelem.o\
 	rawmemelem_inv.o\
 	rawmemelemcpy.o\
@@ -145,65 +312,145 @@ OBJ =\
 	rawmemrchr_inv.o\
 	rawmemrelem.o\
 	rawmemrelem_inv.o\
+	reallocarray.o\
+	reallocarrayf.o\
+	reallocf.o\
+	reallocfn.o\
+	reallocn.o\
+	stpmove.o\
+	stpnmove.o\
+	stpnset.o\
 	stpntolower.o\
 	stpntoupper.o\
+	stpset.o\
 	stptolower.o\
 	stptoupper.o\
 	strcasechr.o\
 	strcasechr_inv.o\
 	strcasechrnul.o\
 	strcasechrnul_inv.o\
+	strcasecmpnul.o\
 	strcaseends.o\
+	strcaseeq.o\
 	strcaseeqlen.o\
+	strcaseeqnul.o\
+	strcasestarts.o\
 	strcasestr.o\
+	strccpy.o\
 	strchr_inv.o\
 	strchrnul.o\
 	strchrnul_inv.o\
 	strcmove.o\
+	strcmpnul.o\
+	strend.o\
 	strends.o\
+	streq.o\
 	streqlen.o\
+	streqnul.o\
+	strisutf8.o\
+	strmove.o\
 	strncasechr.o\
 	strncasechr_inv.o\
 	strncasechrnul.o\
 	strncasechrnul_inv.o\
+	strncasecmpnul.o\
 	strncaseends.o\
+	strncaseeq.o\
 	strncaseeqlen.o\
+	strncaseeqnul.o\
 	strncasestarts.o\
 	strncasestr.o\
+	strnccpy.o\
 	strnchr.o\
 	strnchr_inv.o\
 	strnchrnul.o\
 	strnchrnul_inv.o\
 	strncmove.o\
+	strncmpnul.o\
 	strnend.o\
 	strnends.o\
+	strneq.o\
 	strneqlen.o\
+	strneqnul.o\
+	strnisutf8.o\
+	strnmove.o\
+	strnreplace.o\
+	strnset.o\
 	strnstarts.o\
 	strnstr.o\
+	strntolower.o\
+	strntoupper.o\
 	strrcasechr.o\
 	strrcasechr_inv.o\
+	strrcaseeqlen.o\
 	strrcasestr.o\
 	strrchr_inv.o\
+	strreplace.o\
+	strreqlen.o\
 	strrncasechr.o\
 	strrncasechr_inv.o\
+	strrncaseeqlen.o\
 	strrncasestr.o\
 	strrnchr.o\
 	strrnchr_inv.o\
+	strrneqlen.o\
 	strrnstr.o\
 	strrstr.o\
+	strset.o\
 	strstarts.o\
+	strtoh.o\
+	strtohh.o\
+	strtoi.o\
+	strtoi16.o\
+	strtoi32.o\
+	strtoi64.o\
+	strtoi8.o\
+	strtolower.o\
 	strtotimespec.o\
 	strtotimeval.o\
+	strtou.o\
+	strtou16.o\
+	strtou32.o\
+	strtou64.o\
+	strtou8.o\
+	strtouh.o\
+	strtouhh.o\
+	strtoupper.o\
+	strtouz.o\
+	strtoz.o\
 	sumtimespec.o\
 	sumtimeval.o\
 	timespec2timeval.o\
+	timespectodouble.o\
 	timespectostr.o\
+	timeval2timespec.o\
+	timevaltodouble.o\
 	timevaltostr.o\
+	unlist.o\
+	valigned_allocn.o\
+	valigned_reallocfn.o\
+	valloc.o\
+	vallocn.o\
+	vallocz.o\
+	valloczn.o\
 	vasprintf.o\
+	vcallocn.o\
+	venprintf.o\
+	veprintf.o\
+	vmallocn.o\
+	vmemalignn.o\
+	vmemalignzn.o\
 	vmemalloc.o\
+	vposix_memalignn.o\
 	vputenvf.o\
+	vpvallocn.o\
+	vpvalloczn.o\
+	vreallocfn.o\
+	vvallocn.o\
+	vvalloczn.o\
 	vweprintf.o\
 	wcsndup.o\
+	weprintf.o\
 	wmemdup.o\
 	libsimple.o
 
@@ -218,50 +465,68 @@ MAN3 =\
 
 TESTS = $(OBJ:.o=.test) libsimple-arg.test
 
-all: libsimple.a $(TESTS)
-$(OBJ): $(@:.o=.c) $(HDR)
-$(TESTS): $(@:=.o) test.o libsimple.a
-$(TESTS:=.o): $(@:.test.o=.c) $(HDR) test.h
+LOBJ = $(OBJ:.o=.lo)
+
+all: libsimple.a libsimple.$(LIBEXT) $(TESTS)
+tests: $(TESTS)
+$(OBJ): $(HDR)
+$(TESTS): test.o libsimple.a
+$(TESTS:.test=.to): $(HDR) test.h
 
 test.o: test.c $(HDR) test.h
-	$(CC) -c -o $@ test.c $(CFLAGS) -DTEST -O0 -ffreestanding
+	$(CC) -c -o $@ test.c $(CFLAGS) $(CPPFLAGS) -DTEST -O0 -ffreestanding
 
 libsimple.a: $(OBJ)
-	$(AR) rc $@ $?
+	@rm -f -- $@
+	$(AR) rc $@ $(OBJ)
 	$(AR) -s $@
 
-.test.o.test:
+libsimple.$(LIBEXT): $(LOBJ)
+	$(CC) $(LIBFLAGS) -o $@ $(LOBJ) $(LDFLAGS)
+
+.to.test:
 	$(CC) -o $@ $< test.o libsimple.a $(LDFLAGS)
 
-.c.test.o:
-	$(CC) -c -o $@ $< $(CFLAGS) -DTEST -O0
+.c.to:
+	$(CC) -c -o $@ $< $(CFLAGS) $(CPPFLAGS) -DTEST -O0
+
+.c.o:
+	$(CC) -c -o $@ $< $(CFLAGS) $(CPPFLAGS)
+
+.c.lo:
+	$(CC) -fPIC -c -o $@ $< $(CFLAGS) $(CPPFLAGS)
 
 check: $(TESTS)
 	@set -e; for t in $(TESTS); do printf '%s\n' "./$$t"; $(CHECK_PREFIX) "./$$t"; done
 
-install: libsimple.a
+install: libsimple.a libsimple.$(LIBEXT)
 	mkdir -p -- "$(DESTDIR)$(PREFIX)/lib"
 	mkdir -p -- "$(DESTDIR)$(PREFIX)/include/libsimple"
-	mkdir -p -- "$(DESTDIR)$(PREFIX)/share/man/man0"
-	mkdir -p -- "$(DESTDIR)$(PREFIX)/share/man/man3"
+	mkdir -p -- "$(DESTDIR)$(MANPREFIX)/man0"
+	mkdir -p -- "$(DESTDIR)$(MANPREFIX)/man3"
 	cp -- libsimple.a "$(DESTDIR)$(PREFIX)/lib"
+	cp -- libsimple.$(LIBEXT) "$(DESTDIR)$(PREFIX)/lib/libsimple.$(LIBMINOREXT)"
+	$(FIX_INSTALL_NAME) "$(DESTDIR)$(PREFIX)/lib/libsimple.$(LIBMINOREXT)"
+	ln -sf -- libsimple.$(LIBMINOREXT) "$(DESTDIR)$(PREFIX)/lib/libsimple.$(LIBMAJOREXT)"
+	ln -sf -- libsimple.$(LIBMAJOREXT) "$(DESTDIR)$(PREFIX)/lib/libsimple.$(LIBEXT)"
 	cp -- libsimple.h "$(DESTDIR)$(PREFIX)/include"
 	cp -- libsimple-arg.h "$(DESTDIR)$(PREFIX)/include"
 	cp -- $(SUBHDR) "$(DESTDIR)$(PREFIX)/include/libsimple"
-	cp -- $(MAN0) "$(DESTDIR)$(PREFIX)/share/man/man0"
-	cp -P -- $(MAN3) "$(DESTDIR)$(PREFIX)/share/man/man3"
+	cp -P -- $(MAN0) "$(DESTDIR)$(MANPREFIX)/man0"
+	cp -P -- $(MAN3) "$(DESTDIR)$(MANPREFIX)/man3"
 
 uninstall:
 	-rm -f -- "$(DESTDIR)$(PREFIX)/lib/libsimple.a"
 	-rm -f -- "$(DESTDIR)$(PREFIX)/include/libsimple.h"
 	-rm -f -- "$(DESTDIR)$(PREFIX)/include/libsimple-arg.h"
 	-rm -rf -- "$(DESTDIR)$(PREFIX)/include/libsimple"
-	-cd -- "$(DESTDIR)$(PREFIX)/share/man" && rm -f -- $(MAN0) $(MAN3)
+	-cd -- "$(DESTDIR)$(MANPREFIX)/man0" && rm -f -- $(MAN0)
+	-cd -- "$(DESTDIR)$(MANPREFIX)/man3" && rm -f -- $(MAN3)
 
 clean:
-	-rm -rf -- *.o *.su *.a *.so *.so.* *.gch *.gcda *.gcno *.gcov *.lo *.test
+	-rm -rf -- *.o *.su *.a *.so *.so.* *.gch *.gcda *.gcno *.gcov *.lo *.test *.to
 
 .SUFFIXES:
-.SUFFIXES: .test .test.o .o .c
+.SUFFIXES: .test .to .lo .o .c
 
 .PHONY: all check install uninstall clean