ExternalVendorCode/serval-dna
1
0
Fork 0
mirror of https://github.com/servalproject/serval-dna.git synced 2025-04-06 18:46:43 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Treat empty bsk the same as null

Browse Source
This commit is contained in:
Jeremy Lakeman 2013-01-07 16:45:42 +10:30
parent 5ac394a3c1
commit 9d6b1ae660
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
commandline.c
View File

@ -1064,8 +1064,13 @@ int app_rhizome_add_file(int argc, const char *const *argv, const struct command
if (authorSidHex[0] && fromhexstr(authorSid.binary, authorSidHex, SID_SIZE) == -1)
return WHYF("invalid author_sid: %s", authorSidHex);
rhizome_bk_t bsk;
// treat empty string the same as null
if (bskhex && !*bskhex)
bskhex=NULL;
if (bskhex && fromhexstr(bsk.binary, bskhex, RHIZOME_BUNDLE_KEY_BYTES) == -1)
return WHYF("invalid bsk: %s", bskhex);
return WHYF("invalid bsk: \"%s\"", bskhex);
if (create_serval_instance_dir() == -1)
return -1;
@ -1311,9 +1316,13 @@ int app_rhizome_extract_file(int argc, const char *const *argv, const struct com
char manifestIdUpper[RHIZOME_MANIFEST_ID_STRLEN + 1];
tohex(manifestIdUpper, manifest_id, RHIZOME_MANIFEST_ID_BYTES);
// treat empty string the same as null
if (bskhex && !*bskhex)
bskhex=NULL;
rhizome_bk_t bsk;
if (bskhex && fromhexstr(bsk.binary, bskhex, RHIZOME_BUNDLE_KEY_BYTES) == -1)
return WHYF("invalid bsk: %s", bskhex);
return WHYF("invalid bsk: \"%s\"", bskhex);
rhizome_manifest *m = rhizome_new_manifest();
if (m==NULL)