[file-roller: 1/2] 7z: drop parsing support for p7zip prior 4.55



commit 60f9a5f8a4c11bb1a0415146f30d8deadb135e5b
Author: Peter Keresztes Schmidt <carbenium outlook com>
Date:   Tue Aug 6 01:35:28 2019 +0200

    7z: drop parsing support for p7zip prior 4.55

 src/fr-command-7z.c | 20 +-------------------
 1 file changed, 1 insertion(+), 19 deletions(-)
---
diff --git a/src/fr-command-7z.c b/src/fr-command-7z.c
index 8ad69cf4..5a79f54b 100644
--- a/src/fr-command-7z.c
+++ b/src/fr-command-7z.c
@@ -38,7 +38,6 @@ struct _FrCommand7z
 {
        FrCommand  parent_instance;
        gboolean   list_started;
-       gboolean   old_style;
        FileData  *fdata;
 };
 
@@ -97,24 +96,7 @@ list__process_line (char     *line,
        g_return_if_fail (line != NULL);
 
        if (! self->list_started) {
-               if (strncmp (line, "p7zip Version ", 14) == 0) {
-                       const char *ver_start;
-                       int         ver_len;
-                       char        version[256];
-
-                       ver_start = _g_str_eat_spaces (line + 14);
-                       ver_len = strchr (ver_start, ' ') - ver_start;
-                       strncpy (version, ver_start, ver_len);
-                       version[ver_len] = 0;
-
-                       if ((strcmp (version, "4.55") < 0) && (ver_len > 1) && (version[1] == '.'))
-                               self->old_style = TRUE;
-                       else
-                               self->old_style = FALSE;
-               }
-               else if (self->old_style && (strncmp (line, "Listing archive: ", 17) == 0))
-                       self->list_started = TRUE;
-               else if (! self->old_style && (strcmp (line, "----------") == 0))
+               if (strcmp (line, "----------") == 0)
                        self->list_started = TRUE;
                else if (strncmp (line, "Multivolume = ", 14) == 0) {
                        fields = g_strsplit (line, " = ", 2);


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]