From 24f9b30fec4205b19aed95a21f634d87e1eeeea7 Mon Sep 17 00:00:00 2001 From: hgutch Date: Tue, 9 May 2023 15:43:39 +0000 Subject: Reset SIGCHLD handler to SIG_DFL. If run with "-c", both child and parent script processes will handle SIGCHLD resulting in a possible duplicate "Script done" line in the output. This fixes bin/54514. --- usr.bin/script/script.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'usr.bin/script/script.c') diff --git a/usr.bin/script/script.c b/usr.bin/script/script.c index 275a0de951e..1adcd86273b 100644 --- a/usr.bin/script/script.c +++ b/usr.bin/script/script.c @@ -1,4 +1,4 @@ -/* $NetBSD: script.c,v 1.33 2022/02/13 19:40:14 christos Exp $ */ +/* $NetBSD: script.c,v 1.34 2023/05/09 15:43:39 hgutch Exp $ */ /* * Copyright (c) 1980, 1992, 1993 @@ -39,7 +39,7 @@ __COPYRIGHT("@(#) Copyright (c) 1980, 1992, 1993\ #if 0 static char sccsid[] = "@(#)script.c 8.1 (Berkeley) 6/6/93"; #endif -__RCSID("$NetBSD: script.c,v 1.33 2022/02/13 19:40:14 christos Exp $"); +__RCSID("$NetBSD: script.c,v 1.34 2023/05/09 15:43:39 hgutch Exp $"); #endif /* not lint */ #include @@ -192,6 +192,7 @@ main(int argc, char *argv[]) fail(); } if (child == 0) { + (void)xsignal(SIGCHLD, SIG_DFL); subchild = child = fork(); if (child == -1) { warn("fork"); -- cgit