aljaz/lightning
1
0
Fork 0
mirror of https://github.com/aljazceru/lightning.git synced 2026-01-21 14:54:22 +01:00
Code Issues Packages Projects Releases Wiki Activity

common/configdir: simply supply defaults, leave parsing to programs.

Browse Source 
We're going to get tricky with lightingd's parsing next, so split it out.

Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
This commit is contained in:
Rusty Russell
2019-07-25 15:05:36 +09:30
parent 875854f71c
commit 0b5b1faff5
4 changed files with 28 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
cli/lightning-cli.c
View File

@@ -392,12 +392,13 @@ int main(int argc, char *argv[])
int fd, i;
size_t off;
const char *method;
char *cmd, *resp, *idstr, *rpc_filename;
char *cmd, *resp, *idstr;
struct sockaddr_un addr;
jsmntok_t *toks;
const jsmntok_t *result, *error, *id;
char *lightning_dir;
const tal_t *ctx = tal(NULL, char);
char *lightning_dir = default_configdir(ctx);
char *rpc_filename = default_rpcfile(ctx);
jsmn_parser parser;
int parserr;
enum format format = DEFAULT_FORMAT;
@@ -409,7 +410,14 @@ int main(int argc, char *argv[])
jsmn_init(&parser);
opt_set_alloc(opt_allocfn, tal_reallocfn, tal_freefn);
configdir_register_opts(ctx, &lightning_dir, &rpc_filename);
opt_register_arg("--lightning-dir=<dir>", opt_set_talstr, opt_show_charp,
&lightning_dir,
"Set working directory. All other files are relative to this");
opt_register_arg("--rpc-file", opt_set_talstr, opt_show_charp,
&rpc_filename,
"Set JSON-RPC socket (or /dev/tty)");
opt_register_noarg("--help|-h", opt_usage_and_exit,
"<command> [<params>...]", "Show this message. Use the command help (without hyphens -- \"lightning-cli help\") to get a list of all RPC commands");