diff options
author | rbuj <[email protected]> | 2021-01-26 23:00:05 +0100 |
---|---|---|
committer | raveit65 <[email protected]> | 2021-02-17 23:48:46 +0100 |
commit | 64314d125d696401af3af527b5450cfd4b0ea188 (patch) | |
tree | 038824eda9b242a93fd1cf76eed60ec5f9572ad6 /src/fr-command-rar.c | |
parent | 259e70cab9bbcaec93b106df587f33681238ba50 (diff) | |
download | engrampa-64314d125d696401af3af527b5450cfd4b0ea188.tar.bz2 engrampa-64314d125d696401af3af527b5450cfd4b0ea188.tar.xz |
rar 6.00: fix listing archive content with encrypted file list
Diffstat (limited to 'src/fr-command-rar.c')
-rw-r--r-- | src/fr-command-rar.c | 16 |
1 files changed, 4 insertions, 12 deletions
diff --git a/src/fr-command-rar.c b/src/fr-command-rar.c index 3602e29..e2eb8df 100644 --- a/src/fr-command-rar.c +++ b/src/fr-command-rar.c @@ -687,18 +687,10 @@ fr_command_rar_handle_error (FrCommand *comm, for (scan = g_list_last (comm->process->err.raw); scan; scan = scan->prev) { char *line = scan->data; - if (strstr (line, "password incorrect") != NULL) { - error->type = FR_PROC_ERROR_ASK_PASSWORD; - break; - } - - if (strstr (line, "password is incorrect") != NULL) { - error->type = FR_PROC_ERROR_ASK_PASSWORD; - break; - } - - if (strstr (line, "wrong password") != NULL) - { + if ((strstr (line, "Incorrect password") != NULL) || + (strstr (line, "password incorrect") != NULL) || + (strstr (line, "password is incorrect") != NULL) || + (strstr (line, "wrong password") != NULL)) { error->type = FR_PROC_ERROR_ASK_PASSWORD; break; } |