X-Git-Url: https://www.fi.muni.cz/~kas/git//home/kas/public_html/git/?a=blobdiff_plain;f=backend%2Fcomics%2Fcomics-document.c;h=4d74385a9ecb43061340c8a0047454bb5d00fac0;hb=a90e38bd4aab8013c402e55753275f5b3408e103;hp=c2c625a19942ea9443a8a958f160ec4c048c284e;hpb=b35d0e8093d0a9e3499091b028e8c7ff101c0af1;p=evince.git diff --git a/backend/comics/comics-document.c b/backend/comics/comics-document.c index c2c625a1..4d74385a 100644 --- a/backend/comics/comics-document.c +++ b/backend/comics/comics-document.c @@ -1,6 +1,6 @@ /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8; c-indent-level: 8 -*- */ /* - * Copyright (C) 2009, Juanjo Marín + * Copyright (C) 2009-2010 Juanjo Marín * Copyright (C) 2005, Teemu Tervo * * This program is free software; you can redistribute it and/or modify @@ -15,14 +15,13 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ #include #include #include -#include #include #include @@ -31,11 +30,28 @@ #include #include +#ifdef G_OS_WIN32 +# define WIFEXITED(x) ((x) != 3) +# define WEXITSTATUS(x) (x) +#else +# include +#endif + #include "comics-document.h" #include "ev-document-misc.h" #include "ev-document-thumbnails.h" #include "ev-file-helpers.h" +#ifdef G_OS_WIN32 +/* On windows g_spawn_command_line_sync reads stdout in O_BINARY mode, not in O_TEXT mode. + * As a consequence, newlines are in a platform dependent representation (\r\n). This + * might be considered a bug in glib. + */ +#define EV_EOL "\r\n" +#else +#define EV_EOL "\n" +#endif + typedef enum { RARLABS, @@ -58,13 +74,15 @@ struct _ComicsDocument gchar *archive, *dir; GPtrArray *page_names; - gchar *selected_command; + gchar *selected_command, *alternative_command; gchar *extract_command, *list_command, *decompress_tmp; + gboolean regex_arg; gint offset; ComicBookDecompressType command_usage; }; #define OFFSET_7Z 53 +#define OFFSET_ZIP 2 #define NO_OFFSET 0 /* For perfomance reasons of 7z* we've choosen to decompress on the temporary @@ -76,6 +94,7 @@ struct _ComicsDocument * @list: command line arguments to list the archive contents * @decompress_tmp: command line arguments to pass to extract the archive * into a directory. + * @regex_arg: whether the command can accept regex expressions * @offset: the position offset of the filename on each line in the output of * running the @list command */ @@ -83,27 +102,28 @@ typedef struct { char *extract; char *list; char *decompress_tmp; + gboolean regex_arg; gint offset; } ComicBookDecompressCommand; static const ComicBookDecompressCommand command_usage_def[] = { /* RARLABS unrar */ - {"%s p -c- -ierr --", "%s vb -c- -- %s", NULL , NO_OFFSET}, + {"%s p -c- -ierr --", "%s vb -c- -- %s", NULL , FALSE, NO_OFFSET}, /* GNA! unrar */ - {NULL , "%s t %s" , "%s -xf %s %s" , NO_OFFSET}, + {NULL , "%s t %s" , "%s -xf %s %s" , FALSE, NO_OFFSET}, /* unzip */ - {"%s -p -C --" , "%s -Z -1 -- %s" , NULL , NO_OFFSET}, + {"%s -p -C --" , "%s %s" , NULL , TRUE , OFFSET_ZIP}, /* 7zip */ - {NULL , "%s l -- %s" , "%s x -y %s -o%s", OFFSET_7Z}, + {NULL , "%s l -- %s" , "%s x -y %s -o%s", FALSE, OFFSET_7Z}, /* tar */ - {"%s -xOf" , "%s -tf %s" , NULL , NO_OFFSET} + {"%s -xOf" , "%s -tf %s" , NULL , FALSE, NO_OFFSET} }; -static void comics_document_document_thumbnails_iface_init (EvDocumentThumbnailsIface *iface); +static void comics_document_document_thumbnails_iface_init (EvDocumentThumbnailsInterface *iface); static GSList* get_supported_image_extensions (void); static void get_page_size_area_prepared_cb (GdkPixbufLoader *loader, @@ -122,6 +142,59 @@ EV_BACKEND_REGISTER_WITH_CODE (ComicsDocument, comics_document, comics_document_document_thumbnails_iface_init); } ); +/** + * comics_regex_quote: + * @unquoted_string: a literal string + * + * Quotes a string so unzip will not interpret the regex expressions of + * @unquoted_string. Basically, this functions uses [] to disable regex + * expressions. The return value must be freed with * g_free() + * + * Return value: quoted and disabled-regex string + **/ +static gchar * +comics_regex_quote (const gchar *unquoted_string) +{ + const gchar *p; + GString *dest; + + dest = g_string_new ("'"); + + p = unquoted_string; + + while (*p) { + switch (*p) { + /* * matches a sequence of 0 or more characters */ + case ('*'): + /* ? matches exactly 1 charactere */ + case ('?'): + /* [...] matches any single character found inside + * the brackets. Disabling the first bracket is enough. + */ + case ('['): + g_string_append (dest, "["); + g_string_append_c (dest, *p); + g_string_append (dest, "]"); + break; + /* Because \ escapes regex expressions that we are + * disabling for unzip, we need to disable \ too */ + case ('\\'): + g_string_append (dest, "[\\\\]"); + break; + /* Escape single quote inside the string */ + case ('\''): + g_string_append (dest, "'\\''"); + break; + default: + g_string_append_c (dest, *p); + break; + } + ++p; + } + g_string_append_c (dest, '\''); + return g_string_free (dest, FALSE); +} + /* This function manages the command for decompressing a comic book */ static gboolean @@ -179,19 +252,30 @@ static gboolean comics_generate_command_lines (ComicsDocument *comics_document, GError **error) { - gchar *quoted_file; + gchar *quoted_file, *quoted_file_aux; + gchar *quoted_command; ComicBookDecompressType type; type = comics_document->command_usage; - quoted_file = g_shell_quote (comics_document->archive); - - comics_document->extract_command = - g_strdup_printf (command_usage_def[type].extract, - comics_document->selected_command); - comics_document->list_command = - g_strdup_printf (command_usage_def[type].list, - comics_document->selected_command, - quoted_file); + comics_document->regex_arg = command_usage_def[type].regex_arg; + quoted_command = g_shell_quote (comics_document->selected_command); + if (comics_document->regex_arg) { + quoted_file = comics_regex_quote (comics_document->archive); + quoted_file_aux = g_shell_quote (comics_document->archive); + comics_document->list_command = + g_strdup_printf (command_usage_def[type].list, + comics_document->alternative_command, + quoted_file_aux); + g_free (quoted_file_aux); + } else { + quoted_file = g_shell_quote (comics_document->archive); + comics_document->list_command = + g_strdup_printf (command_usage_def[type].list, + quoted_command, quoted_file); + } + comics_document->extract_command = + g_strdup_printf (command_usage_def[type].extract, + quoted_command); comics_document->offset = command_usage_def[type].offset; if (command_usage_def[type].decompress_tmp) { comics_document->dir = ev_mkdtemp ("evince-comics-XXXXXX", error); @@ -202,10 +286,10 @@ comics_generate_command_lines (ComicsDocument *comics_document, comics_document->decompress_tmp = g_strdup_printf (command_usage_def[type].decompress_tmp, - comics_document->selected_command, - quoted_file, + quoted_command, quoted_file, comics_document->dir); g_free (quoted_file); + g_free (quoted_command); if (!comics_decompress_temp_dir (comics_document->decompress_tmp, comics_document->selected_command, error)) @@ -214,6 +298,7 @@ comics_generate_command_lines (ComicsDocument *comics_document, return TRUE; } else { g_free (quoted_file); + g_free (quoted_command); return TRUE; } @@ -289,7 +374,10 @@ comics_check_decompress_command (gchar *mime_type, /* InfoZIP's unzip program */ comics_document->selected_command = g_find_program_in_path ("unzip"); - if (comics_document->selected_command) { + comics_document->alternative_command = + g_find_program_in_path ("zipnote"); + if (comics_document->selected_command && + comics_document->alternative_command) { comics_document->command_usage = UNZIP; return TRUE; } @@ -406,7 +494,8 @@ comics_document_load (EvDocument *document, } /* FIXME: is this safe against filenames containing \n in the archive ? */ - cb_files = g_strsplit (std_out, "\n", 0); + cb_files = g_strsplit (std_out, EV_EOL, 0); + g_free (std_out); if (!cb_files) { @@ -496,7 +585,7 @@ comics_document_get_page_size (EvDocument *document, guchar buf[1024]; gboolean success, got_size = FALSE; gint outpipe = -1; - GPid child_pid = -1; + GPid child_pid; gssize bytes; GdkPixbuf *pixbuf; gchar *filename; @@ -571,7 +660,7 @@ comics_document_render_pixbuf (EvDocument *document, guchar buf[4096]; gboolean success; gint outpipe = -1; - GPid child_pid = -1; + GPid child_pid; gssize bytes; gint width, height; gchar *filename; @@ -708,6 +797,7 @@ comics_document_finalize (GObject *object) g_free (comics_document->archive); g_free (comics_document->selected_command); + g_free (comics_document->alternative_command); g_free (comics_document->extract_command); g_free (comics_document->list_command); @@ -801,7 +891,7 @@ comics_document_thumbnails_get_dimensions (EvDocumentThumbnails *document, } static void -comics_document_document_thumbnails_iface_init (EvDocumentThumbnailsIface *iface) +comics_document_document_thumbnails_iface_init (EvDocumentThumbnailsInterface *iface) { iface->get_thumbnail = comics_document_thumbnails_get_thumbnail; iface->get_dimensions = comics_document_thumbnails_get_dimensions; @@ -818,8 +908,14 @@ extract_argv (EvDocument *document, gint page) if (page >= comics_document->page_names->len) return NULL; - quoted_archive = g_shell_quote (comics_document->archive); - quoted_filename = g_shell_quote (comics_document->page_names->pdata[page]); + if (comics_document->regex_arg) { + quoted_archive = comics_regex_quote (comics_document->archive); + quoted_filename = + comics_regex_quote (comics_document->page_names->pdata[page]); + } else { + quoted_archive = g_shell_quote (comics_document->archive); + quoted_filename = g_shell_quote (comics_document->page_names->pdata[page]); + } command_line = g_strdup_printf ("%s %s %s", comics_document->extract_command,