Prepare for 2.10.0.0; remove pedantic posix; support loopwhilex -x ""

9 files changed, 11 insertions, 40 deletions

diff --git a/package/configure-snippets/configure_case_lines b/package/configure-snippets/configure_case_lines
index e193af8..30bde83 100644
--- a/package/configure-snippets/configure_case_lines
+++ b/package/configure-snippets/configure_case_lines
@@ -1,7 +1,5 @@
     --shebangdir=*) shebangisdefault=false ; shebangdir=${arg#*=} ;;
     --enable-nsss|--enable-nsss=yes) usensss=true ;;
     --disable-nsss|--enable-nsss=no) usensss=false ;;
-    --enable-pedantic-posix|--enable-pedantic-posix=yes) pposix=true ;;
-    --disable-pedantic-posix|--enable-pedantic-posix=no) pposix=false ;;
     --enable-multicall|--enable-multicall=yes) multicall=true ;;
     --disable-multicall|--enable-multicall=no) multicall=false ;;
diff --git a/package/configure-snippets/configure_generate_configh b/package/configure-snippets/configure_generate_configh
index ef276bd..cd338aa 100644
--- a/package/configure-snippets/configure_generate_configh
+++ b/package/configure-snippets/configure_generate_configh
@@ -1,6 +1,2 @@
 echo "#define ${package_macro_name}_SHEBANGPREFIX \"$shebangdir/\""
 echo
-echo "#undef ${package_macro_name}_PEDANTIC_POSIX"
-if $pposix ; then
-echo "#define ${package_macro_name}_PEDANTIC_POSIX"
-fi
diff --git a/package/configure-snippets/configure_generate_make b/package/configure-snippets/configure_generate_make
index dbf93ff..3590ea5 100644
--- a/package/configure-snippets/configure_generate_make
+++ b/package/configure-snippets/configure_generate_make
@@ -5,11 +5,6 @@ else
   echo "LIBNSSS :="
   echo "MAYBEPTHREAD_LIB :="
 fi
-if $pposix ; then
-  echo "PEDANTIC_POSIX := 1"
-else
-  echo "PEDANTIC_POSIX :="
-fi
 if $multicall ; then
   echo "MULTICALL := 1"
 else
diff --git a/package/configure-snippets/configure_help_options b/package/configure-snippets/configure_help_options
index c6fd410..0874fae 100644
--- a/package/configure-snippets/configure_help_options
+++ b/package/configure-snippets/configure_help_options
@@ -1,4 +1,3 @@
   --enable-nsss                 use the nsss library for user information [disabled]
-  --enable-pedantic-posix       use pedantically POSIX-compatible binaries [disabled]
   --enable-multicall            build a multicall binary [disabled]
 
diff --git a/package/configure-snippets/configure_init_vars b/package/configure-snippets/configure_init_vars
index 91a8590..ad92eac 100644
--- a/package/configure-snippets/configure_init_vars
+++ b/package/configure-snippets/configure_init_vars
@@ -1,4 +1,3 @@
 shebangisdefault=true
 usensss=false
-pposix=false
 multicall=false
diff --git a/package/deps.mak b/package/deps.mak
index 44338fd..94192c2 100644
--- a/package/deps.mak
+++ b/package/deps.mak
@@ -5,6 +5,7 @@
 src/execline/background.o src/execline/background.lo: src/execline/background.c src/include/execline/execline.h
 src/execline/backtick.o src/execline/backtick.lo: src/execline/backtick.c src/include/execline/execline.h
 src/execline/case.o src/execline/case.lo: src/execline/case.c src/include/execline/execline.h
+src/execline/cd.o src/execline/cd.lo: src/execline/cd.c
 src/execline/define.o src/execline/define.lo: src/execline/define.c src/include-local/exlsn.h
 src/execline/dollarat.o src/execline/dollarat.lo: src/execline/dollarat.c
 src/execline/elgetopt.o src/execline/elgetopt.lo: src/execline/elgetopt.c src/include/execline/execline.h
@@ -14,8 +15,6 @@ src/execline/eltest.o src/execline/eltest.lo: src/execline/eltest.c
 src/execline/emptyenv.o src/execline/emptyenv.lo: src/execline/emptyenv.c src/include/execline/execline.h
 src/execline/envfile.o src/execline/envfile.lo: src/execline/envfile.c
 src/execline/exec.o src/execline/exec.lo: src/execline/exec.c
-src/execline/execline-cd.o src/execline/execline-cd.lo: src/execline/execline-cd.c
-src/execline/execline-umask.o src/execline/execline-umask.lo: src/execline/execline-umask.c
 src/execline/execlineb.o src/execline/execlineb.lo: src/execline/execlineb.c src/include/execline/execline.h src/include-local/exlsn.h
 src/execline/exit.o src/execline/exit.lo: src/execline/exit.c
 src/execline/export-array.o src/execline/export-array.lo: src/execline/export-array.c src/include/execline/execline.h
@@ -43,13 +42,12 @@ src/execline/multidefine.o src/execline/multidefine.lo: src/execline/multidefine
 src/execline/multisubstitute.o src/execline/multisubstitute.lo: src/execline/multisubstitute.c src/include/execline/execline.h src/include-local/exlsn.h
 src/execline/pipeline.o src/execline/pipeline.lo: src/execline/pipeline.c src/include/execline/execline.h
 src/execline/piperw.o src/execline/piperw.lo: src/execline/piperw.c
-src/execline/posix-cd.o src/execline/posix-cd.lo: src/execline/posix-cd.c
-src/execline/posix-umask.o src/execline/posix-umask.lo: src/execline/posix-umask.c
 src/execline/redirfd.o src/execline/redirfd.lo: src/execline/redirfd.c src/include/execline/execline.h
 src/execline/runblock.o src/execline/runblock.lo: src/execline/runblock.c src/include/execline/execline.h
 src/execline/shift.o src/execline/shift.lo: src/execline/shift.c src/include/execline/execline.h
 src/execline/trap.o src/execline/trap.lo: src/execline/trap.c src/include/execline/execline.h
 src/execline/tryexec.o src/execline/tryexec.lo: src/execline/tryexec.c src/include/execline/execline.h
+src/execline/umask.o src/execline/umask.lo: src/execline/umask.c
 src/execline/unexport.o src/execline/unexport.lo: src/execline/unexport.c
 src/execline/wait.o src/execline/wait.lo: src/execline/wait.c src/include/execline/config.h src/include/execline/execline.h
 src/execline/withstdinas.o src/execline/withstdinas.lo: src/execline/withstdinas.c src/include/execline/execline.h
@@ -82,6 +80,7 @@ src/libexecline/exlsn_free.o src/libexecline/exlsn_free.lo: src/libexecline/exls
 src/libexecline/exlsn_importas.o src/libexecline/exlsn_importas.lo: src/libexecline/exlsn_importas.c src/include/execline/execline.h src/include-local/exlsn.h
 src/libexecline/exlsn_main.o src/libexecline/exlsn_main.lo: src/libexecline/exlsn_main.c src/include/execline/execline.h src/include-local/exlsn.h
 src/libexecline/exlsn_multidefine.o src/libexecline/exlsn_multidefine.lo: src/libexecline/exlsn_multidefine.c src/include/execline/execline.h src/include-local/exlsn.h
+src/multicall/execline.o src/multicall/execline.lo: src/multicall/execline.c src/include/execline/config.h src/include/execline/execline.h src/include-local/exlsn.h
 
 background: EXTRA_LIBS := ${SPAWN_LIB}
 background: src/execline/background.o ${LIBEXECLINE} -lskarnet
@@ -89,6 +88,8 @@ backtick: EXTRA_LIBS := ${SPAWN_LIB}
 backtick: src/execline/backtick.o ${LIBEXECLINE} -lskarnet
 case: EXTRA_LIBS :=
 case: src/execline/case.o ${LIBEXECLINE} -lskarnet
+cd: EXTRA_LIBS :=
+cd: src/execline/cd.o -lskarnet
 define: EXTRA_LIBS :=
 define: src/execline/define.o ${LIBEXECLINE} -lskarnet
 dollarat: EXTRA_LIBS :=
@@ -107,10 +108,6 @@ envfile: EXTRA_LIBS :=
 envfile: src/execline/envfile.o -lskarnet
 exec: EXTRA_LIBS :=
 exec: src/execline/exec.o -lskarnet
-execline-cd: EXTRA_LIBS :=
-execline-cd: src/execline/execline-cd.o -lskarnet
-execline-umask: EXTRA_LIBS :=
-execline-umask: src/execline/execline-umask.o -lskarnet
 execlineb: EXTRA_LIBS :=
 execlineb: src/execline/execlineb.o ${LIBEXECLINE} -lskarnet
 exit: EXTRA_LIBS :=
@@ -165,10 +162,6 @@ pipeline: EXTRA_LIBS := ${SPAWN_LIB}
 pipeline: src/execline/pipeline.o ${LIBEXECLINE} -lskarnet
 piperw: EXTRA_LIBS :=
 piperw: src/execline/piperw.o -lskarnet
-posix-cd: EXTRA_LIBS :=
-posix-cd: src/execline/posix-cd.o -lskarnet
-posix-umask: EXTRA_LIBS :=
-posix-umask: src/execline/posix-umask.o -lskarnet
 redirfd: EXTRA_LIBS :=
 redirfd: src/execline/redirfd.o ${LIBEXECLINE} -lskarnet
 runblock: EXTRA_LIBS :=
@@ -179,6 +172,8 @@ trap: EXTRA_LIBS := ${SPAWN_LIB}
 trap: src/execline/trap.o ${LIBEXECLINE} -lskarnet
 tryexec: EXTRA_LIBS :=
 tryexec: src/execline/tryexec.o ${LIBEXECLINE} -lskarnet
+umask: EXTRA_LIBS :=
+umask: src/execline/umask.o -lskarnet
 unexport: EXTRA_LIBS :=
 unexport: src/execline/unexport.o -lskarnet
 wait: EXTRA_LIBS :=
diff --git a/package/info b/package/info
index 518ffa8..76d9d2c 100644
--- a/package/info
+++ b/package/info
@@ -1,4 +1,4 @@
 package=execline
-version=2.9.9.2
+version=2.10.0.0
 category=admin
 package_macro_name=EXECLINE
diff --git a/package/modes b/package/modes
index b07e67a..025602e 100644
--- a/package/modes
+++ b/package/modes
@@ -1,14 +1,13 @@
 background		0755
 backtick		0755
 case			0755
+cd			0755
 define			0755
 dollarat		0755
 elgetopt		0755
 elgetpositionals	0755
 elglob			0755
 eltest			0755
-execline-cd		0755
-execline-umask		0755
 emptyenv		0755
 envfile			0755
 exec			0755
@@ -39,13 +38,12 @@ multidefine		0755
 multisubstitute		0755
 piperw			0755
 pipeline		0755
-posix-cd		0755
-posix-umask		0755
 redirfd			0755
 runblock		0755
 shift			0755
 trap			0755
 tryexec			0755
+umask			0755
 unexport		0755
 wait			0755
 withstdinas		0755
diff --git a/package/targets.mak b/package/targets.mak
index 8fc04a1..a255280 100644
--- a/package/targets.mak
+++ b/package/targets.mak
@@ -6,7 +6,7 @@ ifeq ($(MULTICALL),1)
 
 BIN_TARGETS := execline
 CONTENTS := $(notdir $(wildcard src/execline/deps-exe/*))
-BIN_SYMLINKS := cd umask $(CONTENTS)
+BIN_SYMLINKS := $(CONTENTS)
 EXTRA_TARGETS += src/multicall/execline.c
 
 define symlink_definition
@@ -22,14 +22,5 @@ src/multicall/execline.o: src/multicall/execline.c src/include/execline/config.h
 else
 
 BIN_TARGETS := $(notdir $(wildcard src/execline/deps-exe/*))
-BIN_SYMLINKS := cd umask
-
-ifeq ($(PEDANTIC_POSIX),1)
-SYMLINK_TARGET_cd := posix-cd
-SYMLINK_TARGET_umask := posix-umask
-else
-SYMLINK_TARGET_cd := execline-cd
-SYMLINK_TARGET_umask := execline-umask
-endif
 
 endif