skylab/MasterPassword
2
0
Fork 0
Code Releases Activity

Fix ./build's targets interpretation & other improvements.

Browse Source
This commit is contained in:
Maarten Billemont
2017-09-01 11:16:09 -04:00
parent 9a5e9ced31
commit 060ce61030
7 changed files with 15 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
platform-independent/cli-c/cli/mpw-cli.c
View File

@@ -203,14 +203,9 @@ int main(const int argc, char *const argv[]) {
return EX_DATAERR;
}
if ((!masterPassword || !strlen( masterPassword )) && masterPasswordFDArg) {
FILE *masterPasswordFile = fdopen( atoi( masterPasswordFDArg ), "r" );
if (!masterPasswordFile)
wrn( "Error opening master password FD %s: %s\n", masterPasswordFDArg, strerror( errno ) );
else {
masterPassword = mpw_read_file( masterPasswordFile );
if (ferror( masterPasswordFile ))
wrn( "Error reading master password from %s: %d\n", masterPasswordFDArg, ferror( masterPasswordFile ) );
}
masterPassword = mpw_read_fd( atoi( masterPasswordFDArg ) );
if (!masterPassword && errno)
wrn( "Error reading master password from FD %s: %s\n", masterPasswordFDArg, strerror( errno ) );
}
if ((!masterPassword || !strlen( masterPassword )) && masterPasswordArg)
masterPassword = strdup( masterPasswordArg );