From nobody Thu Nov 10 22:44:36 2022 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4N7cN45JFJz4dDcb; Thu, 10 Nov 2022 22:44:36 +0000 (UTC) (envelope-from git@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4N7cN44VL6z4Q07; Thu, 10 Nov 2022 22:44:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1668120276; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=BvKyTA2NQCE4OcMldn7tIoeuF1aQBV/3cHwis+g66ds=; b=XuxF9VZrJjIi1m0/AFn53adXGqkBDkEDgY4Zyksj+1ve0Fk+pSoF9UYz2dorWAE9f2bp+F QIq3LLdSC3UdBo6jiPQn1kxVBpld79QWUnfOFAkuWDHc29RWS/fOi7uGqkFRFFU0tQMYbp jIp3J3Rq06lvUVqfwh83NfaF5EOZkI9gtioIQir4uXk2zlVkLHMRTM1TSk0mSR6pq38Gs4 7URowxDUBFvYrY6DMDxkxBcdqIawT40/pKzZ3TP0jQ+doReYemp0TXoanNVaDF9PTb7mnj ZCzDcmW5oQagnb8q0/s/f0XWL+WFzagtowelgvPYJZe2NadMqJYU4507tVl6KA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1668120276; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=BvKyTA2NQCE4OcMldn7tIoeuF1aQBV/3cHwis+g66ds=; b=U/ppmukp32wDUgX8tSygh53thfNFlEsspDXORmvGPzKaArVL6dFgHvuSg0sWSl2nSI4Dvx A4WchG7gR0JtCCJPYF0enu7p4zBh81+YrXL23FxvSFyUrc77OelUERV/OgSe0siXdAZYhW 2dc0b4kHur8oXKyDwZCWLJPpBl9W4AFT0YdcRSHyM06f5KttuEAn/a+HlWyMrXPqGBdLmK ZU6sZNetgIYrL+I8F+dYMgnjhB/Zc4U3Zzaqy7vXocazf+t0soS+u6dYg9/FyZda7CMIb6 Qu9F8g9oDfJVzXtI/LwwhM7mkBUGAUU0wUxPGZ2EhIV726wWI8QsdzwIlZaXBA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1668120276; a=rsa-sha256; cv=none; b=F3cNsNU1PPIcW97UV42DWQGrVHiU/7605/LgpOumzcMeX6UddHvkYxF4SHiDpI5tqrHWfJ 1qK72CoTo36CCbxkO33OYcRlEqH6n1zXkdBL5gye/zp0df+71JjfSFNV7Gpi4LHQgsEQg3 4//TLziYeXIwnk0ekim5gam82aC64lbdjKsOc/Xm9UL4a8X7kbs1yudrDIiR/sb8+/tqk3 fMtrXQt10sTIaPycQ9RQi2k7FQclez7K3WccMVwgW9niE7Tn6JCrG49pm0shpH0bnSkPno TRQV/vQrAF9f7FM7dUNHY2QvQTt1NP3WTRpLgiWofRNZmn5sjinfdbtVMxQtbQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4N7cN43P7wzJVc; Thu, 10 Nov 2022 22:44:36 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 2AAMiaFH099848; Thu, 10 Nov 2022 22:44:36 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2AAMiasw099847; Thu, 10 Nov 2022 22:44:36 GMT (envelope-from git) Date: Thu, 10 Nov 2022 22:44:36 GMT Message-Id: <202211102244.2AAMiasw099847@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mateusz Guzik Subject: git: 6c49b65d6da2 - stable/13 - xargs: fix exit code when using -P List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mjg X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 6c49b65d6da24cc50409418b26a2df1bdbdb672e Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by mjg: URL: https://cgit.FreeBSD.org/src/commit/?id=6c49b65d6da24cc50409418b26a2df1bdbdb672e commit 6c49b65d6da24cc50409418b26a2df1bdbdb672e Author: liu-du AuthorDate: 2022-10-16 03:41:54 +0000 Commit: Mateusz Guzik CommitDate: 2022-11-10 22:43:58 +0000 xargs: fix exit code when using -P currently when xargs runs in parallel mode (e.g. -P2), it somtimes incorrectly returns zero exit code. this commit fix it and also adds tests. Reviewed by: mjg PR: 267110 (cherry picked from commit 0ca740d9a639ab635f5a28be9051d0124a9544a1) --- usr.bin/xargs/tests/regress.sh | 7 ++++++- usr.bin/xargs/xargs.c | 12 ++++++++---- 2 files changed, 14 insertions(+), 5 deletions(-) diff --git a/usr.bin/xargs/tests/regress.sh b/usr.bin/xargs/tests/regress.sh index 72458a42d774..e79bfd4352fa 100644 --- a/usr.bin/xargs/tests/regress.sh +++ b/usr.bin/xargs/tests/regress.sh @@ -1,6 +1,6 @@ # $FreeBSD$ -echo 1..16 +echo 1..20 REGRESSION_START($1) @@ -21,4 +21,9 @@ REGRESSION_TEST(`0L', `xargs -0 -L2 echo <${SRCDIR}/regress.0.in') REGRESSION_TEST(`0P1', `xargs -0 -P1 echo <${SRCDIR}/regress.0.in') REGRESSION_TEST(`quotes', `xargs -n1 echo <${SRCDIR}/regress.quotes.in') +REGRESSION_TEST_FREEFORM(`parallel1', `echo /var/empty /var/empty | xargs -n1 -P2 test -d; [ $? = 0 ]') +REGRESSION_TEST_FREEFORM(`parallel2', `echo /var/empty /var/empty/nodir | xargs -n1 -P2 test -d; [ $? = 1 ]') +REGRESSION_TEST_FREEFORM(`parallel3', `echo /var/empty/nodir /var/empty | xargs -n1 -P2 test -d; [ $? = 1 ]') +REGRESSION_TEST_FREEFORM(`parallel4', `echo /var/empty/nodir /var/empty/nodir | xargs -n1 -P2 test -d; [ $? = 1 ]') + REGRESSION_END() diff --git a/usr.bin/xargs/xargs.c b/usr.bin/xargs/xargs.c index 2825a26f4dfa..6520d43dae50 100644 --- a/usr.bin/xargs/xargs.c +++ b/usr.bin/xargs/xargs.c @@ -314,8 +314,10 @@ parse_input(int argc, char *argv[]) switch (ch = getchar()) { case EOF: /* No arguments since last exec. */ - if (p == bbp) - xexit(*av, rval); + if (p == bbp) { + waitchildren(*av, 1); + exit(rval); + } goto arg1; case ' ': case '\t': @@ -405,8 +407,10 @@ arg2: *xp++ = *avj; } prerun(argc, av); - if (ch == EOF || foundeof) - xexit(*av, rval); + if (ch == EOF || foundeof) { + waitchildren(*av, 1); + exit(rval); + } p = bbp; xp = bxp; count = 0;