summaryrefslogtreecommitdiff
path: root/app/cwm
diff options
context:
space:
mode:
authorOkan Demirmen <okan@cvs.openbsd.org>2018-01-08 16:21:55 +0000
committerOkan Demirmen <okan@cvs.openbsd.org>2018-01-08 16:21:55 +0000
commit367ffd95d2ebe25211ef220a3b2976f8114d59d5 (patch)
treea5b06419d26460f1ee36cb39f9603aef35d00b83 /app/cwm
parentc00801de923e125863aaf8180439d59d610b2517 (diff)
Quick fix: exit after a failed execvp in u_spawn instead; previously we did in
u_exec, but the introduction of re-exec'ing the previous invocation of cwm if 'exec_wm' failed missed the 'exec' failing path. Will likely split out as a proper fix. Odd behaviour reported by Ve Telko.
Diffstat (limited to 'app/cwm')
-rw-r--r--app/cwm/util.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/app/cwm/util.c b/app/cwm/util.c
index 174a542c8..8d44c2664 100644
--- a/app/cwm/util.c
+++ b/app/cwm/util.c
@@ -15,7 +15,7 @@
* ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*
- * $OpenBSD: util.c,v 1.19 2017/12/29 20:09:19 okan Exp $
+ * $OpenBSD: util.c,v 1.20 2018/01/08 16:21:54 okan Exp $
*/
#include <sys/types.h>
@@ -37,7 +37,7 @@ u_spawn(char *argstr)
switch (fork()) {
case 0:
u_exec(argstr);
- break;
+ exit(1);
case -1:
warn("fork");
default: