public inbox for passt-dev@passt.top
 help / color / mirror / code / Atom feed
From: David Gibson <david@gibson.dropbear.id.au>
To: Paul Holzinger <pholzing@redhat.com>
Cc: passt-dev@passt.top
Subject: Re: [PATCH v2] pasta: propagate exit code from child command
Date: Mon, 13 Feb 2023 13:37:12 +1100	[thread overview]
Message-ID: <Y+miWL775RriNdAy@yekko> (raw)
In-Reply-To: <20230209145948.20773-1-pholzing@redhat.com>

[-- Attachment #1: Type: text/plain, Size: 1670 bytes --]

On Thu, Feb 09, 2023 at 03:59:49PM +0100, Paul Holzinger wrote:
> Exits codes are very useful for scripts, when the pasta child execvp()
> call fails with ENOENT that parent should also exit with > 0. In short
> the parent should always exit with the code from the child to make it
> useful in scripts.
> 
> It is easy to test with: `pasta -- bash -c "exit 3"; echo $?`
> 
> Signed-off-by: Paul Holzinger <pholzing@redhat.com>

Oops, I'm a little embarrassed I didn't think of that before.

Reviewed-by: David Gibson <david@gibson.dropbear.id.au>

> ---
> Changes from v1:
>  - Fixed comments from Stefano.
> 
>  pasta.c | 12 ++++++++++--
>  1 file changed, 10 insertions(+), 2 deletions(-)
> 
> diff --git a/pasta.c b/pasta.c
> index 3f6477c..fe21c5b 100644
> --- a/pasta.c
> +++ b/pasta.c
> @@ -64,9 +64,17 @@ void pasta_child_handler(int signal)
>  
>  	if (pasta_child_pid &&
>  	    !waitid(P_PID, pasta_child_pid, &infop, WEXITED | WNOHANG)) {
> -		if (infop.si_pid == pasta_child_pid)
> -			exit(EXIT_SUCCESS);
> +		if (infop.si_pid == pasta_child_pid) {
> +			if (infop.si_code == CLD_EXITED)
> +				exit(infop.si_status);
> +
> +			/* If killed by a signal, si_status is the number.
> +			 * Follow common shell convention of returning it + 128.
> +			 */
> +			exit(infop.si_status + 128);
> +
>  			/* Nothing to do, detached PID namespace going away */
> +		}
>  	}
>  
>  	waitid(P_ALL, 0, NULL, WEXITED | WNOHANG);

-- 
David Gibson			| I'll have my music baroque, and my code
david AT gibson.dropbear.id.au	| minimalist, thank you.  NOT _the_ _other_
				| _way_ _around_!
http://www.ozlabs.org/~dgibson

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]

      parent reply	other threads:[~2023-02-13  3:12 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-02-09 14:59 [PATCH v2] pasta: propagate exit code from child command Paul Holzinger
2023-02-13  1:16 ` Stefano Brivio
2023-02-13  2:37 ` David Gibson [this message]

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=Y+miWL775RriNdAy@yekko \
    --to=david@gibson.dropbear.id.au \
    --cc=passt-dev@passt.top \
    --cc=pholzing@redhat.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this public inbox

	https://passt.top/passt

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for IMAP folder(s).