mirrors/passt
1
0
Fork 0
mirror of https://passt.top/passt synced 2025-06-29 00:35:35 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

conf, log: On -h / --help, print usage to stdout, not stderr

Browse source 
Erik suggests that this makes it easier to grep for options, and with
--help we're anyway printing usage information as expected, not as
part of an error report.

While at it: on -h, we should exit with 0.

Reported-by: Erik Sjölund <erik.sjolund@gmail.com>
Link: https://bugs.passt.top/show_bug.cgi?id=52
Link: https://bugs.passt.top/show_bug.cgi?id=53
Signed-off-by: Stefano Brivio <sbrivio@redhat.com>
Reviewed-by: David Gibson <david@gibson.dropbear.id.au>
This commit is contained in:
Stefano Brivio 2023-06-04 07:14:49 +02:00
parent d072ac2434
commit 3c6d1b9bb2
3 changed files with 24 additions and 8 deletions

23
conf.c
View file

@ -717,10 +717,11 @@ static unsigned int conf_ip6(unsigned int ifi,
}
/**
* usage() - Print usage and exit
* print_usage() - Print usage, exit with given status code
* @name: Executable name
* @status: Status code for exit()
*/
static void usage(const char *name)
static void print_usage(const char *name, int status)
{
if (strstr(name, "pasta")) {
info("Usage: %s [OPTION]... [COMMAND] [ARGS]...", name);
@ -856,7 +857,7 @@ static void usage(const char *name)
info( " SPEC is as described for TCP above");
info( " default: none");
exit(EXIT_FAILURE);
exit(status);
pasta_opts:
@ -906,7 +907,16 @@ pasta_opts:
info( " Don't copy all addresses to namespace");
info( " --ns-mac-addr ADDR Set MAC address on tap interface");
exit(EXIT_FAILURE);
exit(status);
}
/**
* usage() - Print usage and exit with failure
* @name: Executable name
*/
static void usage(const char *name)
{
print_usage(name, EXIT_FAILURE);
}
/**
@ -1630,8 +1640,11 @@ void conf(struct ctx *c, int argc, char **argv)
case 'U':
/* Handle these later, once addresses are configured */
break;
case '?':
case 'h':
log_to_stdout = 1;
print_usage(argv[0], EXIT_SUCCESS);
break;
case '?':
default:
usage(argv[0]);
break;