summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorrbuj <[email protected]>2021-01-26 23:00:05 +0100
committerraveit65 <[email protected]>2021-02-17 23:52:49 +0100
commitd6b7a2895c2acc6e8a27cd6f3f1e270af42d14e1 (patch)
tree8ba5b8db11a5c00caef7c390db28d3ffa01e2903
parent989277f2f181f9d869ee493b48343e5a98f8f7c6 (diff)
downloadengrampa-d6b7a2895c2acc6e8a27cd6f3f1e270af42d14e1.tar.bz2
engrampa-d6b7a2895c2acc6e8a27cd6f3f1e270af42d14e1.tar.xz
rar 6.00: fix listing archive content with encrypted file list
-rw-r--r--src/fr-command-rar.c16
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;
}