js/scrypt-genpass
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Update usage message

Browse source
This commit is contained in:
Chris Oei 2012-09-08 17:39:35 -07:00
parent 35fcbda1b3
commit 6011dff707
1 changed files with 8 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

12
main.c
View file

@ -41,10 +41,14 @@ usage(void)
{ {
fprintf(stderr, fprintf(stderr,
"usage: scrypt-genpass [-l LEN] [-m MAXMEM] [-n] [-o MAXOPS] [-k KEYFILE] [-p PASS] <site>\n"); "Usage: scrypt-genpass [-l LEN] [-m MAXMEM] [-n] [-o MAXOPS] [-k KEYFILE]\n");
fprintf(stderr,
" [-p PASS] <site>\n");
fprintf(stderr, fprintf(stderr,
" scrypt-genpass -t\n"); " scrypt-genpass -t\n");
fprintf(stderr, "Version: %s\n", SGVERSION); fprintf(stderr,
"\nFor documentation, see https://github.com/chrisoei/scrypt-genpass/wiki\n\n");
fprintf(stderr, "Commit hash: %s\n", SGVERSION);
exit(1); exit(1);
} }
@ -160,13 +164,13 @@ main(int argc, char *argv[])
size_t n = fread(combinedkey + sg_parms.passwdlen, keyfilelen, 1, fp); size_t n = fread(combinedkey + sg_parms.passwdlen, keyfilelen, 1, fp);
fclose(fp); fclose(fp);
if (n != 1) { if (n != 1) {
warn("Unable to read keyfile"); warnx("Unable to read keyfile");
exit(1); exit(1);
} }
sg_parms.passwd = combinedkey; sg_parms.passwd = combinedkey;
sg_parms.passwdlen += keyfilelen; sg_parms.passwdlen += keyfilelen;
} else { } else {
warn("Unable to allocate memory for combined key"); warnx("Unable to allocate memory for combined key");
exit(1); exit(1);
} }
} else { } else {