Move open_archive() to separate module

[geeqie.git] / src / misc.cc

diff --git a/src/misc.cc b/src/misc.cc
index 9767e01..15439d0 100644 (file)
--- a/src/misc.cc
+++ b/src/misc.cc
@@ -23,8 +23,6 @@
 #include <sys/stat.h>
 #include <unistd.h>
 
-#include <cerrno>
-#include <cstdint>
 #include <cstdio>
 #include <cstdlib>
 #include <cstring>
@@ -36,9 +34,6 @@
 #include <config.h>
 
 #include "debug.h"
-#include "filedata.h"
-#include "intl.h"
-#include "main-defines.h"
 #include "main.h"
 #include "options.h"
 #include "ui-fileops.h"
@@ -439,192 +434,4 @@ void gq_gtk_grid_attach_default(GtkGrid *grid, GtkWidget *child, guint left_atta
        gtk_grid_attach(grid, child, left_attach, top_attach, right_attach - left_attach, bottom_attach - top_attach);
 }
 
-/* Copied from the libarchive .repo. examples */
-
-#if !HAVE_ARCHIVE
-gchar *open_archive(FileData *)
-{
-       log_printf("%s", _("Warning: libarchive not installed"));
-       return NULL;
-}
-
-#else
-
-#include <archive.h>
-#include <archive_entry.h>
-
-static void errmsg(const char *);
-static gboolean extract(const char *filename, int do_extract, int flags);
-static int copy_data(struct archive *, struct archive *);
-static void msg(const char *);
-static int verbose = 0;
-
-gchar *open_archive(FileData *fd)
-{
-       int flags;
-       gchar *current_dir;
-       gchar *destination_dir;
-       gboolean success;
-       gint error;
-
-       destination_dir = g_build_filename(g_get_tmp_dir(), GQ_ARCHIVE_DIR, instance_identifier, fd->path, NULL);
-
-       if (!recursive_mkdir_if_not_exists(destination_dir, 0755))
-               {
-               log_printf("%s%s%s", _("Open Archive - Cannot create directory: "), destination_dir, "\n");
-               g_free(destination_dir);
-               return nullptr;
-               }
-
-       current_dir = g_get_current_dir();
-       error = chdir(destination_dir);
-       if (error)
-               {
-               log_printf("%s%s%s%s%s", _("Open Archive - Cannot change directory to: "), destination_dir, _("\n  Error code: "), strerror(errno), "\n");
-               g_free(destination_dir);
-               g_free(current_dir);
-               return nullptr;
-               }
-
-       flags = ARCHIVE_EXTRACT_TIME;
-       success = extract(fd->path, 1, flags);
-
-       error = chdir(current_dir);
-       if (error)
-               {
-               log_printf("%s%s%s%s%s", _("Open Archive - Cannot change directory to: "), current_dir, _("\n  Error code: "), strerror(errno), "\n");
-               g_free(destination_dir);
-               g_free(current_dir);
-               return nullptr;
-               }
-       g_free(current_dir);
-
-       if (!success)
-               {
-               g_free(destination_dir);
-               destination_dir = nullptr;
-               }
-
-       return destination_dir;
-}
-
-static gboolean extract(const char *filename, int do_extract, int flags)
-{
-       struct archive *a;
-       struct archive *ext;
-       struct archive_entry *entry;
-       int r;
-
-       a = archive_read_new();
-       ext = archive_write_disk_new();
-       archive_write_disk_set_options(ext, flags);
-       archive_write_disk_set_standard_lookup(ext);
-       archive_read_support_filter_all(a);
-       archive_read_support_format_all(a);
-
-       if (filename != nullptr && strcmp(filename, "-") == 0)
-               {
-               filename = nullptr;
-               }
-       if ((r = archive_read_open_filename(a, filename, 10240)))
-               {
-               errmsg(archive_error_string(a));
-               errmsg("\n");
-               return(FALSE);
-               }
-       for (;;)
-               {
-               int needcr = 0;
-
-               r = archive_read_next_header(a, &entry);
-               if (r == ARCHIVE_EOF)
-                       {
-                       break;
-                       }
-               if (r != ARCHIVE_OK)
-                       {
-                       errmsg(archive_error_string(a));
-                       errmsg("\n");
-                       return(FALSE);
-                       }
-               if (verbose && do_extract)
-                       {
-                       msg("x ");
-                       }
-               if (verbose || !do_extract)
-                       {
-                       msg(archive_entry_pathname(entry));
-                       msg(" ");
-                       needcr = 1;
-                       }
-               if (do_extract)
-                       {
-                       r = archive_write_header(ext, entry);
-                       if (r != ARCHIVE_OK)
-                               {
-                               errmsg(archive_error_string(a));
-                               needcr = 1;
-                               }
-                       else
-                               {
-                               r = copy_data(a, ext);
-                               if (r != ARCHIVE_OK)
-                                       {
-                                       needcr = 1;
-                                       }
-                               }
-                       }
-               if (needcr)
-                       {
-                       msg("\n");
-                       }
-               }
-       archive_read_close(a);
-       archive_read_free(a);
-
-       archive_write_close(ext);
-       archive_write_free(ext);
-       return(TRUE);
-}
-
-static int copy_data(struct archive *ar, struct archive *aw)
-{
-       int r;
-       const void *buff;
-       size_t size;
-       int64_t offset;
-
-       for (;;)
-               {
-               r = archive_read_data_block(ar, &buff, &size, &offset);
-               if (r == ARCHIVE_EOF)
-                       return (ARCHIVE_OK);
-               if (r != ARCHIVE_OK)
-                       {
-                       errmsg(archive_error_string(ar));
-                       return (r);
-                       }
-               r = archive_write_data_block(aw, buff, size, offset);
-               if (r != ARCHIVE_OK)
-                       {
-                       errmsg(archive_error_string(ar));
-                       return (r);
-                       }
-               }
-}
-
-static void msg(const char *m)
-{
-       log_printf("Open Archive - libarchive error: %s \n", m);
-}
-
-static void errmsg(const char *m)
-{
-       if (m == nullptr)
-               {
-               m = "Error: No error description provided.\n";
-               }
-       log_printf("Open Archive - libarchive error: %s \n", m);
-}
-#endif
 /* vim: set shiftwidth=8 softtabstop=0 cindent cinoptions={1s: */