From nobody Mon Oct 17 10:40:04 2022 X-Original-To: dev-commits-src-main@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 4MrYR91fQyz4fX3y; Mon, 17 Oct 2022 10:40:05 +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 4MrYR90nb8z3Xmw; Mon, 17 Oct 2022 10:40:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1666003205; 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=IDFLEZb7K5Xbh2jKHE1/9/ZLC4PlZ74LhYi4x6e61sk=; b=rsQ5vrXbnKIqCjqKP1L/urSdEMknRW3eotKWQ2gEKgnqf2eYPNTX9kF5lacIeSkVFaW6YB fZEbSG9dHGVFwcGt1DzgRCE87lPZCANuvls4OQYDG8AE0k9GG6RAFGqJpiBIDzGjcg4ITn s6ajPgMRG3zDRu/VDX7nX86+8DDOKoeeEohiCf9OqxzcAUrH8A5hR8fEg51TYkAbbJtZkq 6Ejnr82G0EuwuLbNRD95B/vROVN7HxloH+cXrR+dQXiCSuq1pZTjYx582YdFEqgHa2Kw55 zB+MjLiErHd/WY+JjV/zac4lfbRI0/6XvJbjuIpi0JHfh1IQaye6jO2n1OcAGw== 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 4MrYR86ycgzn5D; Mon, 17 Oct 2022 10:40:04 +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 29HAe46t035250; Mon, 17 Oct 2022 10:40:04 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 29HAe4k8035247; Mon, 17 Oct 2022 10:40:04 GMT (envelope-from git) Date: Mon, 17 Oct 2022 10:40:04 GMT Message-Id: <202210171040.29HAe4k8035247@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mateusz Guzik Subject: git: 0ca740d9a639 - main - xargs: fix exit code when using -P List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: 0ca740d9a639ab635f5a28be9051d0124a9544a1 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1666003205; 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=IDFLEZb7K5Xbh2jKHE1/9/ZLC4PlZ74LhYi4x6e61sk=; b=Cp3oqaTGgZXR7Mbmj+78GfdnizSVHpWJIdKf9lwf0CZDbbwJwdTzZQub4C+ZCpaDD1qw3T 6bFvzrz2SFwADUcqyzx5dc+6qpfoK7YFUNn4s0MU4pZYFXVjFwEM764DWAUCAJ6vwzxCwv ZjjcuqUCb18aSoYDrWGZkiuSJuapCT0rDoPlBvuCT1EbB5U7V1x4xvnukxhqcamqGonrpK R+rAuUx5Xplf/CKFVDtMaXt7Vuwn+6uzolCY0ByO4u1lYNAAoQrQXeW2acNq8Jeg7ReWLY uo4hlPMoU+4T5fsfLtiM+rvKFE6yC24ZF/ISFeoLiS1+o85LjICsQF4EyElreQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1666003205; a=rsa-sha256; cv=none; b=qtddWErILTEaLpUi6AN3N+8fE1ZUQfyqb89B4AADbwiMwa5pbTtH6Gu1VxGaRBozKd8wFv Oj5t0OJA7Y3y7tmGfVIrjcLOAQ1Ic5O3/LSEwDgg+NyHXnwsBLPikSC9Y/xkEm66qAjLOS e1vYGq4XYhJzQmij7wKjpHzckl51WYqJFL6aNOHFHnOesG1txAqFfXmJRWUDwLHo9Xn2WK x8khaizmiJCukgs4MGiRkJaqNoYLyF1opN7slDl1jd//EGTJiYy5tnAa28wwMppOyiDaV7 M5d/31JmTKXQrHlnAhhYSKeHwzavhLvd6p5XPdYSzfQUp56YzLLQz1aommVnRQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by mjg: URL: https://cgit.FreeBSD.org/src/commit/?id=0ca740d9a639ab635f5a28be9051d0124a9544a1 commit 0ca740d9a639ab635f5a28be9051d0124a9544a1 Author: liu-du AuthorDate: 2022-10-16 03:41:54 +0000 Commit: Mateusz Guzik CommitDate: 2022-10-17 10:39:04 +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 --- 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 7b664cfde1cc..21455e7be26e 100644 --- a/usr.bin/xargs/xargs.c +++ b/usr.bin/xargs/xargs.c @@ -315,8 +315,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': @@ -406,8 +408,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;