aljaz/lightning
1
0
Fork 0
mirror of https://github.com/aljazceru/lightning.git synced 2025-12-19 07:04:22 +01:00
Code Issues Packages Projects Releases Wiki Activity

lightning-cli: fix error code on invalid options, document them.

Browse Source 
The top of the file indicates the following errors:

    #define NO_ERROR 0
    #define ERROR_FROM_LIGHTNINGD 1
    #define ERROR_TALKING_TO_LIGHTNINGD 2
    #define ERROR_USAGE 3

But we didn't use the right one for opt_parse failure, and didn't use the
correct constants everywhere.

Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
This commit is contained in:
Rusty Russell
2023-01-03 14:53:15 +10:30
parent a1e894a445
commit 435f8d84dc
3 changed files with 58 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
cli/lightning-cli.c
View File

@@ -601,6 +601,18 @@ static void opt_show_level(char buf[OPT_SHOW_LEN], const enum log_level *level)
strncpy(buf, log_level_name(*level), OPT_SHOW_LEN-1);
}
/* The standard opt_log_stderr_exit exits with status 1 */
static void opt_log_stderr_exit_usage(const char *fmt, ...)
{
va_list ap;
va_start(ap, fmt);
vfprintf(stderr, fmt, ap);
fprintf(stderr, "\n");
va_end(ap);
exit(ERROR_USAGE);
}
int main(int argc, char *argv[])
{
setup_locale();
@@ -656,8 +668,8 @@ int main(int argc, char *argv[])
opt_register_version();
opt_early_parse(argc, argv, opt_log_stderr_exit);
opt_parse(&argc, argv, opt_log_stderr_exit);
opt_early_parse(argc, argv, opt_log_stderr_exit_usage);
opt_parse(&argc, argv, opt_log_stderr_exit_usage);
method = argv[1];
if (!method) {
@@ -872,7 +884,7 @@ int main(int argc, char *argv[])
}
tal_free(ctx);
opt_free_table();
return 0;
return NO_ERROR;
}
if (format == RAW)
@@ -884,5 +896,5 @@ int main(int argc, char *argv[])
}
tal_free(ctx);
opt_free_table();
return 1;
return ERROR_FROM_LIGHTNINGD;
}