Dominique Leuenberger
1072a20f2e
- Add file-roller-ignore-unrar-if-wrapper.patch: Since unrar is non-free and it is planned to include a limited wrapper that would call unar, we should avoid this wrapper and call unar directly (bsc#1072118). - Add file-roller-rar-file-date.patch: fix wrong file date when using rar 5.30 or higher (bgo#758121). - Add file-roller-unar-dir-critical.patch: fix a warning when parsing lsar output (bgo#791505). OBS-URL: https://build.opensuse.org/request/show/556822 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/file-roller?expand=0&rev=260
132 lines
3.6 KiB
Diff
132 lines
3.6 KiB
Diff
From f1e74492e765a3e055e0bed61cc5b2b930de12ad Mon Sep 17 00:00:00 2001
|
|
From: Paolo Bacchilega <paobac@src.gnome.org>
|
|
Date: Sun, 19 Nov 2017 16:49:32 +0100
|
|
Subject: [PATCH] rar archives: wrong file date when using rar 5.30 or higher
|
|
|
|
adapt to the new format
|
|
|
|
[bug #758121]
|
|
---
|
|
src/fr-command-rar.c | 78 +++++++++++++++++++++++++++++++++++++++++++++-------
|
|
src/fr-command-rar.h | 1 +
|
|
2 files changed, 69 insertions(+), 10 deletions(-)
|
|
|
|
diff --git a/src/fr-command-rar.c b/src/fr-command-rar.c
|
|
index adfc3daa..8f31f7a3 100644
|
|
--- a/src/fr-command-rar.c
|
|
+++ b/src/fr-command-rar.c
|
|
@@ -84,6 +84,61 @@ mktime_from_string (const char *date_s,
|
|
return mktime (&tm);
|
|
}
|
|
|
|
+
|
|
+static time_t
|
|
+mktime_from_string_rar_5_30 (const char *date_s,
|
|
+ const char *time_s)
|
|
+{
|
|
+ struct tm tm = {0, };
|
|
+ char **fields;
|
|
+
|
|
+ tm.tm_isdst = -1;
|
|
+
|
|
+ /* date */
|
|
+
|
|
+ fields = g_strsplit (date_s, "-", 3);
|
|
+ if (fields[0] != NULL) {
|
|
+ tm.tm_year = atoi (fields[0]) - 1900;
|
|
+ if (fields[1] != NULL) {
|
|
+ tm.tm_mon = atoi (fields[1]) - 1;
|
|
+ if (fields[2] != NULL)
|
|
+ tm.tm_mday = atoi (fields[2]);
|
|
+ }
|
|
+ }
|
|
+ g_strfreev (fields);
|
|
+
|
|
+ /* time */
|
|
+
|
|
+ fields = g_strsplit (time_s, ":", 2);
|
|
+ if (fields[0] != NULL) {
|
|
+ tm.tm_hour = atoi (fields[0]);
|
|
+ if (fields[1] != NULL)
|
|
+ tm.tm_min = atoi (fields[1]);
|
|
+ }
|
|
+ g_strfreev (fields);
|
|
+
|
|
+ return mktime (&tm);
|
|
+}
|
|
+
|
|
+
|
|
+/*
|
|
+ * Sample rar 5.30 or higher output:
|
|
+ *
|
|
+
|
|
+RAR 5.30 Copyright (c) 1993-2017 Alexander Roshal 11 Aug 2017
|
|
+Trial version Type 'rar -?' for help
|
|
+
|
|
+Archive: test.rar
|
|
+Details: RAR 5
|
|
+
|
|
+ Attributes Size Packed Ratio Date Time Checksum Name
|
|
+----------- --------- -------- ----- ---------- ----- -------- ----
|
|
+ -rw-r--r-- 51 47 92% 2017-11-19 16:20 80179DAB loremipsum.txt
|
|
+----------- --------- -------- ----- ---------- ----- -------- ----
|
|
+ 51 47 92% 1
|
|
+
|
|
+ */
|
|
+
|
|
/* Sample rar-5 listing output:
|
|
|
|
RAR 5.00 beta 8 Copyright (c) 1993-2013 Alexander Roshal 22 Aug 2013
|
|
@@ -187,15 +242,17 @@ process_line (char *line,
|
|
g_return_if_fail (line != NULL);
|
|
|
|
if (! rar_comm->list_started) {
|
|
- if (strncmp (line, "RAR ", 4) == 0) {
|
|
- int version;
|
|
- sscanf (line, "RAR %d.", &version);
|
|
- rar_comm->rar5 = (version >= 5);
|
|
- }
|
|
- else if (strncmp (line, "UNRAR ", 6) == 0) {
|
|
- int version;
|
|
- sscanf (line, "UNRAR %d.", &version);
|
|
- rar_comm->rar5 = (version >= 5);
|
|
+ if ((strncmp (line, "RAR ", 4) == 0) || (strncmp (line, "UNRAR ", 6) == 0)) {
|
|
+ int major_version;
|
|
+ int minor_version;
|
|
+
|
|
+ if (strncmp (line, "RAR ", 4) == 0)
|
|
+ sscanf (line, "RAR %d.%d", &major_version, &minor_version);
|
|
+ else
|
|
+ sscanf (line, "UNRAR %d.%d", &major_version, &minor_version);
|
|
+
|
|
+ rar_comm->rar5 = (major_version >= 5);
|
|
+ rar_comm->rar5_30 = ((major_version == 5) && (minor_version >= 30)) || (major_version >= 6);
|
|
}
|
|
else if (strncmp (line, "--------", 8) == 0) {
|
|
rar_comm->list_started = TRUE;
|
|
@@ -259,7 +316,8 @@ process_line (char *line,
|
|
}
|
|
else {
|
|
fdata->size = g_ascii_strtoull (size_field, NULL, 10);
|
|
- fdata->modified = mktime_from_string (date_field, time_field);
|
|
+
|
|
+ fdata->modified = rar_comm->rar5_30 ? mktime_from_string_rar_5_30 (date_field, time_field) : mktime_from_string (date_field, time_field);
|
|
|
|
if (attr_field_is_dir (attr_field, rar_comm)) {
|
|
char *tmp;
|
|
diff --git a/src/fr-command-rar.h b/src/fr-command-rar.h
|
|
index 09ed2709..2a6e671d 100644
|
|
--- a/src/fr-command-rar.h
|
|
+++ b/src/fr-command-rar.h
|
|
@@ -44,6 +44,7 @@ struct _FrCommandRar
|
|
gboolean list_started;
|
|
gboolean rar4_odd_line;
|
|
gboolean rar5;
|
|
+ gboolean rar5_30;
|
|
FileData *fdata;
|
|
};
|
|
|
|
--
|
|
2.15.0
|
|
|