Merge branch 'feature/upstream' into develop

1 files changed, 37 insertions, 16 deletions

diff --git a/src/Makefile.in b/src/Makefile.in
index 356dcfe..8257e20 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -101,9 +101,11 @@ check_PROGRAMS = tc-compile$(EXEEXT) tc-cast$(EXEEXT) \
 	tc-map$(EXEEXT) tc-memmem$(EXEEXT) tc-misc$(EXEEXT) \
 	tc-netio$(EXEEXT) tc-option$(EXEEXT) tc-proc$(EXEEXT) \
 	tc-rand$(EXEEXT) tc-realpath$(EXEEXT) tc-shconfig$(EXEEXT) \
-	tc-strchr2$(EXEEXT) tc-string$(EXEEXT) tc-strquote$(EXEEXT) \
-	tc-switchuser$(EXEEXT) tc-time$(EXEEXT) $(am__EXEEXT_1)
-TESTS = tc-strchr2$(EXEEXT) tc-strquote$(EXEEXT) $(am__EXEEXT_2)
+	tc-socket$(EXEEXT) tc-strchr2$(EXEEXT) tc-string$(EXEEXT) \
+	tc-strquote$(EXEEXT) tc-switchuser$(EXEEXT) tc-time$(EXEEXT) \
+	$(am__EXEEXT_1)
+TESTS = tc-format$(EXEEXT) tc-strchr2$(EXEEXT) tc-strquote$(EXEEXT) \
+	$(am__EXEEXT_2)
 @HAVE_CXX_TRUE@am__append_6 = tx-compile tx-cast tx-deque tx-dir \
 @HAVE_CXX_TRUE@                     tx-intdiff tx-list tx-list2 \
 @HAVE_CXX_TRUE@                     tx-misc tx-netio \
@@ -244,6 +246,9 @@ tc_realpath_DEPENDENCIES = libHX.la
 tc_shconfig_SOURCES = tc-shconfig.c
 tc_shconfig_OBJECTS = tc-shconfig.$(OBJEXT)
 tc_shconfig_DEPENDENCIES = libHX.la
+tc_socket_SOURCES = tc-socket.c
+tc_socket_OBJECTS = tc-socket.$(OBJEXT)
+tc_socket_DEPENDENCIES = libHX.la
 tc_strchr2_SOURCES = tc-strchr2.c
 tc_strchr2_OBJECTS = tc-strchr2.$(OBJEXT)
 tc_strchr2_DEPENDENCIES = libHX.la
@@ -354,9 +359,10 @@ am__depfiles_remade = ./$(DEPDIR)/deque.Plo ./$(DEPDIR)/dl.Plo \
 	./$(DEPDIR)/tc-netio.Po ./$(DEPDIR)/tc-option.Po \
 	./$(DEPDIR)/tc-proc.Po ./$(DEPDIR)/tc-rand.Po \
 	./$(DEPDIR)/tc-realpath.Po ./$(DEPDIR)/tc-shconfig.Po \
-	./$(DEPDIR)/tc-strchr2.Po ./$(DEPDIR)/tc-string.Po \
-	./$(DEPDIR)/tc-strquote.Po ./$(DEPDIR)/tc-switchuser.Po \
-	./$(DEPDIR)/tc-time.Po ./$(DEPDIR)/tc_cast-tc-cast.Po \
+	./$(DEPDIR)/tc-socket.Po ./$(DEPDIR)/tc-strchr2.Po \
+	./$(DEPDIR)/tc-string.Po ./$(DEPDIR)/tc-strquote.Po \
+	./$(DEPDIR)/tc-switchuser.Po ./$(DEPDIR)/tc-time.Po \
+	./$(DEPDIR)/tc_cast-tc-cast.Po \
 	./$(DEPDIR)/tc_list2-tc-list2.Po ./$(DEPDIR)/time.Plo \
 	./$(DEPDIR)/tx-cast.Po ./$(DEPDIR)/tx-compile.Po \
 	./$(DEPDIR)/tx-deque.Po ./$(DEPDIR)/tx-dir.Po \
@@ -408,19 +414,19 @@ SOURCES = $(libHX_la_SOURCES) $(libHX_rtcheck_la_SOURCES) tc-cast.c \
 	tc-compile.c tc-deque.c tc-dir.c tc-format.c tc-io.c tc-list.c \
 	tc-list2.c tc-map.c tc-memmem.c tc-misc.c tc-netio.c \
 	tc-option.c tc-proc.c tc-rand.c tc-realpath.c tc-shconfig.c \
-	tc-strchr2.c tc-string.c tc-strquote.c tc-switchuser.c \
-	tc-time.c $(tx_cast_SOURCES) $(tx_compile_SOURCES) \
-	$(tx_deque_SOURCES) $(tx_dir_SOURCES) $(tx_intdiff_SOURCES) \
-	$(tx_list_SOURCES) $(tx_list2_SOURCES) $(tx_misc_SOURCES) \
-	$(tx_netio_SOURCES) $(tx_option_SOURCES) $(tx_proc_SOURCES) \
-	$(tx_rand_SOURCES) $(tx_strchr2_SOURCES) $(tx_string_SOURCES) \
-	$(tx_strquote_SOURCES) $(tx_time_SOURCES)
+	tc-socket.c tc-strchr2.c tc-string.c tc-strquote.c \
+	tc-switchuser.c tc-time.c $(tx_cast_SOURCES) \
+	$(tx_compile_SOURCES) $(tx_deque_SOURCES) $(tx_dir_SOURCES) \
+	$(tx_intdiff_SOURCES) $(tx_list_SOURCES) $(tx_list2_SOURCES) \
+	$(tx_misc_SOURCES) $(tx_netio_SOURCES) $(tx_option_SOURCES) \
+	$(tx_proc_SOURCES) $(tx_rand_SOURCES) $(tx_strchr2_SOURCES) \
+	$(tx_string_SOURCES) $(tx_strquote_SOURCES) $(tx_time_SOURCES)
 DIST_SOURCES = $(am__libHX_la_SOURCES_DIST) \
 	$(libHX_rtcheck_la_SOURCES) tc-cast.c tc-compile.c tc-deque.c \
 	tc-dir.c tc-format.c tc-io.c tc-list.c tc-list2.c tc-map.c \
 	tc-memmem.c tc-misc.c tc-netio.c tc-option.c tc-proc.c \
-	tc-rand.c tc-realpath.c tc-shconfig.c tc-strchr2.c tc-string.c \
-	tc-strquote.c tc-switchuser.c tc-time.c \
+	tc-rand.c tc-realpath.c tc-shconfig.c tc-socket.c tc-strchr2.c \
+	tc-string.c tc-strquote.c tc-switchuser.c tc-time.c \
 	$(am__tx_cast_SOURCES_DIST) $(am__tx_compile_SOURCES_DIST) \
 	$(am__tx_deque_SOURCES_DIST) $(am__tx_dir_SOURCES_DIST) \
 	$(am__tx_intdiff_SOURCES_DIST) $(am__tx_list_SOURCES_DIST) \
@@ -774,7 +780,7 @@ libHX_la_SOURCES = deque.c dl.c format.c io.c map.c mc.c misc.c opt.c \
 	proc.c rand.c socket.c string.c time.c $(am__append_3)
 libHX_la_LIBADD = ${libdl_LIBS} -lm ${libpthread_LIBS} ${librt_LIBS} \
 	$(am__append_4)
-libHX_la_LDFLAGS = -no-undefined -version-info 35:0:3 $(am__append_2)
+libHX_la_LDFLAGS = -no-undefined -version-info 36:0:4 $(am__append_2)
 EXTRA_libHX_la_DEPENDENCIES = libHX.map
 libHX_rtcheck_la_SOURCES = rtcheck.c
 libHX_rtcheck_la_LIBADD = ${libdl_LIBS}
@@ -799,6 +805,7 @@ tc_proc_LDADD = libHX.la
 tc_rand_LDADD = libHX.la
 tc_realpath_LDADD = libHX.la
 tc_shconfig_LDADD = libHX.la
+tc_socket_LDADD = libHX.la
 tc_strchr2_LDADD = libHX.la
 tc_string_LDADD = libHX.la
 tc_strquote_LDADD = libHX.la
@@ -987,6 +994,10 @@ tc-shconfig$(EXEEXT): $(tc_shconfig_OBJECTS) $(tc_shconfig_DEPENDENCIES) $(EXTRA
 	@rm -f tc-shconfig$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(tc_shconfig_OBJECTS) $(tc_shconfig_LDADD) $(LIBS)
 
+tc-socket$(EXEEXT): $(tc_socket_OBJECTS) $(tc_socket_DEPENDENCIES) $(EXTRA_tc_socket_DEPENDENCIES) 
+	@rm -f tc-socket$(EXEEXT)
+	$(AM_V_CCLD)$(LINK) $(tc_socket_OBJECTS) $(tc_socket_LDADD) $(LIBS)
+
 tc-strchr2$(EXEEXT): $(tc_strchr2_OBJECTS) $(tc_strchr2_DEPENDENCIES) $(EXTRA_tc_strchr2_DEPENDENCIES) 
 	@rm -f tc-strchr2$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(tc_strchr2_OBJECTS) $(tc_strchr2_LDADD) $(LIBS)
@@ -1105,6 +1116,7 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tc-rand.Po@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tc-realpath.Po@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tc-shconfig.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tc-socket.Po@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tc-strchr2.Po@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tc-string.Po@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tc-strquote.Po@am__quote@ # am--include-marker
@@ -1427,6 +1439,13 @@ recheck: all $(check_PROGRAMS)
 	        am__force_recheck=am--force-recheck \
 	        TEST_LOGS="$$log_list"; \
 	exit $$?
+tc-format.log: tc-format$(EXEEXT)
+	@p='tc-format$(EXEEXT)'; \
+	b='tc-format'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
 tc-strchr2.log: tc-strchr2$(EXEEXT)
 	@p='tc-strchr2$(EXEEXT)'; \
 	b='tc-strchr2'; \
@@ -1580,6 +1599,7 @@ distclean: distclean-am
 	-rm -f ./$(DEPDIR)/tc-rand.Po
 	-rm -f ./$(DEPDIR)/tc-realpath.Po
 	-rm -f ./$(DEPDIR)/tc-shconfig.Po
+	-rm -f ./$(DEPDIR)/tc-socket.Po
 	-rm -f ./$(DEPDIR)/tc-strchr2.Po
 	-rm -f ./$(DEPDIR)/tc-string.Po
 	-rm -f ./$(DEPDIR)/tc-strquote.Po
@@ -1679,6 +1699,7 @@ maintainer-clean: maintainer-clean-am
 	-rm -f ./$(DEPDIR)/tc-rand.Po
 	-rm -f ./$(DEPDIR)/tc-realpath.Po
 	-rm -f ./$(DEPDIR)/tc-shconfig.Po
+	-rm -f ./$(DEPDIR)/tc-socket.Po
 	-rm -f ./$(DEPDIR)/tc-strchr2.Po
 	-rm -f ./$(DEPDIR)/tc-string.Po
 	-rm -f ./$(DEPDIR)/tc-strquote.Po