From owner-svn-src-all@freebsd.org  Sun Jan 26 10:54:16 2020
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@mailman.nyi.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
 by mailman.nyi.freebsd.org (Postfix) with ESMTP id AD043238F04;
 Sun, 26 Jan 2020 10:54:16 +0000 (UTC) (envelope-from pjd@FreeBSD.org)
Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org
 [IPv6:2610:1c1:1:606c::19:3])
 (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
 server-signature RSA-PSS (4096 bits)
 client-signature RSA-PSS (4096 bits) client-digest SHA256)
 (Client CN "mxrelay.nyi.freebsd.org",
 Issuer "Let's Encrypt Authority X3" (verified OK))
 by mx1.freebsd.org (Postfix) with ESMTPS id 4858rm48DBz3N7y;
 Sun, 26 Jan 2020 10:54:16 +0000 (UTC) (envelope-from pjd@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 899F11FFC8;
 Sun, 26 Jan 2020 10:54:16 +0000 (UTC) (envelope-from pjd@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 00QAsGPN069678;
 Sun, 26 Jan 2020 10:54:16 GMT (envelope-from pjd@FreeBSD.org)
Received: (from pjd@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id 00QAsG5A069677;
 Sun, 26 Jan 2020 10:54:16 GMT (envelope-from pjd@FreeBSD.org)
Message-Id: <202001261054.00QAsG5A069677@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: pjd set sender to pjd@FreeBSD.org
 using -f
From: Pawel Jakub Dawidek <pjd@FreeBSD.org>
Date: Sun, 26 Jan 2020 10:54:16 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r357140 - head/bin/pwait
X-SVN-Group: head
X-SVN-Commit-Author: pjd
X-SVN-Commit-Paths: head/bin/pwait
X-SVN-Commit-Revision: 357140
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 26 Jan 2020 10:54:16 -0000

Author: pjd
Date: Sun Jan 26 10:54:16 2020
New Revision: 357140
URL: https://svnweb.freebsd.org/changeset/base/357140

Log:
  Don't setup a timeout if we are exiting.
  
  Sponsored by:	Fudo Security

Modified:
  head/bin/pwait/pwait.c

Modified: head/bin/pwait/pwait.c
==============================================================================
--- head/bin/pwait/pwait.c	Sun Jan 26 10:51:57 2020	(r357139)
+++ head/bin/pwait/pwait.c	Sun Jan 26 10:54:16 2020	(r357140)
@@ -150,7 +150,7 @@ main(int argc, char *argv[])
 			nleft++;
 	}
 
-	if (tflag) {
+	if (nleft > 0 && tflag) {
 		/*
 		 * Explicitly detect SIGALRM so that an exit status of 124
 		 * can be returned rather than 142.