public inbox for passt-dev@passt.top
 help / color / mirror / code / Atom feed
From: Stefano Brivio <sbrivio@redhat.com>
To: Paul Holzinger <pholzing@redhat.com>
Cc: passt-dev@passt.top
Subject: Re: [PATCH 2/2] pasta: propagate exit code from child command
Date: Wed, 8 Feb 2023 19:14:25 +0100	[thread overview]
Message-ID: <20230208191425.743197cd@elisabeth> (raw)
In-Reply-To: <20230208155441.64306-2-pholzing@redhat.com>

On Wed,  8 Feb 2023 16:54:41 +0100
Paul Holzinger <pholzing@redhat.com> 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>
> ---
>  pasta.c | 11 ++++++++---
>  1 file changed, 8 insertions(+), 3 deletions(-)
> 
> diff --git a/pasta.c b/pasta.c
> index 3f6477c..4b18d7e 100644
> --- a/pasta.c
> +++ b/pasta.c
> @@ -64,9 +64,14 @@ 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);
> -			/* Nothing to do, detached PID namespace going away */
> +		if (infop.si_pid == pasta_child_pid) {
> +			if (infop.si_code == CLD_EXITED)
> +				exit(infop.si_status);
> +
> +			/* else killed by signal, si_status == SIGNUM in this case */

It took me a while to figure out that SIGNUM is not a constant I wasn't
aware of, just the signal number -- I guess you meant 'signum' from
sigaction() or suchlike?

Maybe you could go with:

			/* If killed by a signal, si_status is its number */

> +			exit(infop.si_status + 128);

This is a bit arbitrary -- returning n + 128 is what Bash, zsh, and a
few other shells do, and probably a reasonable convention given that
POSIX says we need to return a value greater than 128. Still I would
mention it:

			/* Arbitrary: return signal number + 128 */

or:

			/* If killed by a signal, si_status is the number.
			 * Follow common shell convention of returning it + 128.
			 */

> +		}
> +		/* Nothing to do, detached PID namespace going away */

This should be moved back into the conditional block (swapping the two
lines above, or moving this comment at the beginning of the block).

If si_pid is not the child, we need to do other stuff (that is, reap
clones).

>  	}
>  
>  	waitid(P_ALL, 0, NULL, WEXITED | WNOHANG);

-- 
Stefano


  reply	other threads:[~2023-02-08 18:14 UTC|newest]

Thread overview: 6+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-02-08 15:54 [PATCH 1/2] pasta: correctly exit when execvp() fails Paul Holzinger
2023-02-08 15:54 ` [PATCH 2/2] pasta: propagate exit code from child command Paul Holzinger
2023-02-08 18:14   ` Stefano Brivio [this message]
2023-02-09 14:23     ` Paul Holzinger
2023-02-08 18:14 ` [PATCH 1/2] pasta: correctly exit when execvp() fails Stefano Brivio
2023-02-13  1:15 ` Stefano Brivio

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=20230208191425.743197cd@elisabeth \
    --to=sbrivio@redhat.com \
    --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).