summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDongHun Kwak <dh0128.kwak@samsung.com>2021-10-13 10:50:19 +0900
committerDongHun Kwak <dh0128.kwak@samsung.com>2021-10-13 10:50:19 +0900
commit3900685a7cc861a11a646420cff3532bc7fb501a (patch)
treede9c1863a6dc1170ffb3d765a949bdb94ab63bc2
parent1a83169dfdb8c561e3895f27c2e719be5bdcec07 (diff)
downloaddash-3900685a7cc861a11a646420cff3532bc7fb501a.tar.gz
dash-3900685a7cc861a11a646420cff3532bc7fb501a.tar.bz2
dash-3900685a7cc861a11a646420cff3532bc7fb501a.zip
Imported Upstream version 0.5.11.3upstream/0.5.11.3
-rwxr-xr-xconfigure20
-rw-r--r--configure.ac2
-rw-r--r--src/jobs.c4
3 files changed, 14 insertions, 12 deletions
diff --git a/configure b/configure
index 7d498ba..e02a51c 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for dash 0.5.11.2.
+# Generated by GNU Autoconf 2.69 for dash 0.5.11.3.
#
#
# Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
@@ -577,8 +577,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='dash'
PACKAGE_TARNAME='dash'
-PACKAGE_VERSION='0.5.11.2'
-PACKAGE_STRING='dash 0.5.11.2'
+PACKAGE_VERSION='0.5.11.3'
+PACKAGE_STRING='dash 0.5.11.3'
PACKAGE_BUGREPORT=''
PACKAGE_URL=''
@@ -1281,7 +1281,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures dash 0.5.11.2 to adapt to many kinds of systems.
+\`configure' configures dash 0.5.11.3 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1348,7 +1348,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of dash 0.5.11.2:";;
+ short | recursive ) echo "Configuration of dash 0.5.11.3:";;
esac
cat <<\_ACEOF
@@ -1451,7 +1451,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-dash configure 0.5.11.2
+dash configure 0.5.11.3
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2045,7 +2045,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by dash $as_me 0.5.11.2, which was
+It was created by dash $as_me 0.5.11.3, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
@@ -2908,7 +2908,7 @@ fi
# Define the identity of the package.
PACKAGE='dash'
- VERSION='0.5.11.2'
+ VERSION='0.5.11.3'
cat >>confdefs.h <<_ACEOF
@@ -5523,7 +5523,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by dash $as_me 0.5.11.2, which was
+This file was extended by dash $as_me 0.5.11.3, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -5589,7 +5589,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-dash config.status 0.5.11.2
+dash config.status 0.5.11.3
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
diff --git a/configure.ac b/configure.ac
index 33f0b08..e396b44 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-AC_INIT([dash],[0.5.11.2])
+AC_INIT([dash],[0.5.11.3])
AM_INIT_AUTOMAKE([foreign subdir-objects])
AC_CONFIG_SRCDIR([src/main.c])
diff --git a/src/jobs.c b/src/jobs.c
index d4c13c0..f30313b 100644
--- a/src/jobs.c
+++ b/src/jobs.c
@@ -81,6 +81,7 @@
#define DOWAIT_NONBLOCK 0
#define DOWAIT_BLOCK 1
#define DOWAIT_WAITCMD 2
+#define DOWAIT_WAITCMD_ALL 4
/* array of jobs */
static struct job *jobtab;
@@ -615,7 +616,7 @@ waitcmd(int argc, char **argv)
jp->waited = 1;
jp = jp->prev_job;
}
- if (!dowait(DOWAIT_WAITCMD, 0))
+ if (!dowait(DOWAIT_WAITCMD_ALL, 0))
goto sigout;
}
}
@@ -1139,6 +1140,7 @@ static int dowait(int block, struct job *jp)
pid = waitone(block, jp);
rpid &= !!pid;
+ block &= ~DOWAIT_WAITCMD_ALL;
if (!pid || (jp && jp->state != JOBRUNNING))
block = DOWAIT_NONBLOCK;
} while (pid >= 0);