diff --git a/cli.c b/cli.c index 22542116..b180810b 100644 --- a/cli.c +++ b/cli.c @@ -379,7 +379,7 @@ int cli_optional_bundle_secret_key(const char *arg) return !arg[0] || str_to_rhizome_bsk_t(NULL, arg) != -1; } -int cli_manifestid(const char *arg) +int cli_bid(const char *arg) { return str_to_rhizome_bid_t(NULL, arg) != -1; } diff --git a/cli.h b/cli.h index 6bf3d1bb..a9c13a5e 100644 --- a/cli.h +++ b/cli.h @@ -102,7 +102,7 @@ int cli_path_regular(const char *arg); int cli_absolute_path(const char *arg); int cli_optional_sid(const char *arg); int cli_optional_bundle_secret_key(const char *arg); -int cli_manifestid(const char *arg); +int cli_bid(const char *arg); int cli_fileid(const char *arg); int cli_optional_bundle_crypt_key(const char *arg); int cli_interval_ms(const char *arg); diff --git a/rhizome_cli.c b/rhizome_cli.c index 8d41d5d2..1adc6f20 100644 --- a/rhizome_cli.c +++ b/rhizome_cli.c @@ -438,7 +438,7 @@ static int app_rhizome_delete(const struct cli_parsed *parsed, struct cli_contex if (config.debug.verbose) DEBUG_cli_parsed(parsed); const char *manifestid, *fileid; - if (cli_arg(parsed, "manifestid", &manifestid, cli_manifestid, NULL) == -1) + if (cli_arg(parsed, "manifestid", &manifestid, cli_bid, NULL) == -1) return -1; if (cli_arg(parsed, "fileid", &fileid, cli_fileid, NULL) == -1) return -1; @@ -544,7 +544,7 @@ static int app_rhizome_extract(const struct cli_parsed *parsed, struct cli_conte if (config.debug.verbose) DEBUG_cli_parsed(parsed); const char *manifestpath, *filepath, *manifestid, *bsktext; - if ( cli_arg(parsed, "manifestid", &manifestid, cli_manifestid, "") == -1 + if ( cli_arg(parsed, "manifestid", &manifestid, cli_bid, "") == -1 || cli_arg(parsed, "manifestpath", &manifestpath, NULL, "") == -1 || cli_arg(parsed, "filepath", &filepath, NULL, "") == -1 || cli_arg(parsed, "bsk", &bsktext, cli_optional_bundle_secret_key, NULL) == -1)