skylab/MasterPassword
2
0
Fork 0
Code Releases Activity

Fix C cli API.

Browse Source
This commit is contained in:
Maarten Billemont 2017-08-13 08:50:16 -04:00
parent d9cdb7ef83
commit a8776eec58
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
platform-darwin/MasterPassword-macOS.xcodeproj/project.pbxproj
View File

@ -3740,6 +3740,7 @@
DAB7AE461F3D466D00C856B1 /* Test */, DAB7AE461F3D466D00C856B1 /* Test */,
); );
defaultConfigurationIsVisible = 0; defaultConfigurationIsVisible = 0;
defaultConfigurationName = Test;
}; };
DAC63274148680650075AEA5 /* Build configuration list for PBXNativeTarget "jrswizzle" */ = { DAC63274148680650075AEA5 /* Build configuration list for PBXNativeTarget "jrswizzle" */ = {
isa = XCConfigurationList; isa = XCConfigurationList;

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

@ -303,8 +303,9 @@ int main(int argc, char *const argv[]) {
fclose( sitesFile ); fclose( sitesFile );
// Parse file. // Parse file.
MPMarshallInfo *sitesInputInfo = mpw_marshall_read_info( sitesInputData );
MPMarshallFormat sitesInputFormat = sitesFormatArg? sitesFormat: sitesInputInfo->format;
MPMarshallError marshallError = { .type = MPMarshallSuccess }; MPMarshallError marshallError = { .type = MPMarshallSuccess };
MPMarshallFormat sitesInputFormat = sitesFormatArg? sitesFormat: mpw_marshall_format_guess( sitesInputData );
user = mpw_marshall_read( sitesInputData, sitesInputFormat, masterPassword, &marshallError ); user = mpw_marshall_read( sitesInputData, sitesInputFormat, masterPassword, &marshallError );
if (marshallError.type == MPMarshallErrorMasterPassword) { if (marshallError.type == MPMarshallErrorMasterPassword) {
// Incorrect master password. // Incorrect master password.