GuillaumeHemmen/spectre-cli
1
0
Fork 0
mirror of https://gitlab.com/spectre.app/cli.git synced 2024-11-01 02:41:44 +01:00
Code Issues Projects Releases Packages Wiki Activity

Marshal data API & fixes.

Browse source
This commit is contained in:
Maarten Billemont 2019-07-28 12:35:36 -04:00
parent 43cd7dac71
commit fb7ee6b38a
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/mpw-cli.c
View file

@ -272,7 +272,7 @@ void cli_free(Arguments *args, Operation *operation) {
mpw_free_strings( &operation->fullName, &operation->masterPassword, &operation->siteName, NULL );
mpw_free_strings( &operation->keyContext, &operation->resultState, &operation->resultParam, NULL );
mpw_free_strings( &operation->identicon, &operation->sitesPath, NULL );
mpw_marshal_free( &operation->file );
mpw_marshal_file_free( &operation->file );
operation->site = NULL;
operation->question = NULL;
cli_masterKeyProvider_free();
@ -487,7 +487,7 @@ void cli_user(Arguments *args, Operation *operation) {
if (!sitesFile) {
// If no user from mpsites, create a new one.
mpw_free_string( &operation->sitesPath );
mpw_marshal_free( &operation->file );
mpw_marshal_file_free( &operation->file );
operation->file = mpw_marshal_file( mpw_marshal_user(
operation->fullName, cli_masterKeyProvider_op( operation ), MPAlgorithmVersionCurrent ), NULL );
}
@ -501,7 +501,7 @@ void cli_user(Arguments *args, Operation *operation) {
// Parse file.
MPMarshalError marshalError = { .type = MPMarshalSuccess };
mpw_marshal_free( &operation->file );
mpw_marshal_file_free( &operation->file );
operation->file = mpw_marshal_read( sitesInputData,
cli_masterKeyProvider_op( operation ), &marshalError );
if (marshalError.type == MPMarshalErrorMasterPassword && operation->allowPasswordUpdate) {
@ -516,7 +516,7 @@ void cli_user(Arguments *args, Operation *operation) {
importMasterPassword = mpw_getpass( "Old master password: " );
}
mpw_marshal_free( &operation->file );
mpw_marshal_file_free( &operation->file );
operation->file = mpw_marshal_read( sitesInputData,
cli_masterKeyProvider_str( importMasterPassword ), &marshalError );
if (operation->file && operation->file->user)