devs/cproof
1
2
Fork 1
Code Issues 43 Pull Requests 9 Actions Packages Projects 1 Releases Wiki Activity

Refactor call_external

Browse Source
This commit is contained in:
William Wennerström
2020-12-11 15:51:01 +01:00
parent 46e938b638
commit 32cfea4bd2
3 changed files with 41 additions and 90 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
src/config/account.c
View File

@@ -200,27 +200,35 @@ account_eval_password(ProfAccount* account)
assert(account != NULL);
assert(account->eval_password != NULL);
gchar** output = NULL;
gchar** error = NULL;
gchar* std_out = NULL;
gchar* std_err = NULL;
gchar* argv[] = { "sh", "-c", account->eval_password, NULL };
if (!call_external(argv, &output, &error)) {
if (!call_external(argv, &std_out, &std_err)) {
log_error("Password command failed with: %s", std_err);
g_free(std_out);
g_free(std_err);
return FALSE;
}
if (!output || !output[0]) {
log_error("Failed to read eval_password output");
g_strfreev(output);
output = NULL;
if (!std_out || !std_out[0]) {
log_error("Password command returned empty output.");
g_free(std_out);
g_free(std_err);
return FALSE;
}
account->password = strdup(output[0]);
g_strfreev(output);
output = NULL;
// Remove leading and trailing whitespace from command output.
gchar* password = g_strdup(std_out);
g_strstrip(password);
account->password = password;
g_free(std_out);
g_free(std_err);
if (!account->password) {
log_error("Failed to allocate enough memory to read eval_password output");
log_error("Failed to allocate enough memory to read password command "
"output");
return FALSE;
}