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=272761f55cded015a12a5f0339b998687341138b;hb=eb80ecd1f7aa6ff57d2a3324c691274745ca4ed0;hp=b82569bb39b04d1689f630a42112a71af7bbb355;hpb=e732e45fbf5930d8c3ac2471ff8912f41152ec7a;p=evince.git

diff --git a/backend/comics/comics-document.c b/backend/comics/comics-document.c
index b82569bb..272761f5 100644
--- a/backend/comics/comics-document.c
+++ b/backend/comics/comics-document.c
@@ -15,7 +15,7 @@
  *
  * 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 <config.h>
@@ -42,6 +42,16 @@
 #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,
@@ -109,7 +119,7 @@ static const ComicBookDecompressCommand command_usage_def[] = {
 	{"%s -xOf"          , "%s -tf %s"      , NULL             , 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,
@@ -186,18 +196,19 @@ comics_generate_command_lines (ComicsDocument *comics_document,
 			       GError         **error)
 {
 	gchar *quoted_file;
+	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);
+	quoted_command = g_shell_quote (comics_document->selected_command);
+
+	comics_document->extract_command =
+			    g_strdup_printf (command_usage_def[type].extract,
+				             quoted_command);
 	comics_document->list_command =
-			    g_strdup_printf (command_usage_def[type].list, 
-				             comics_document->selected_command, 
-					     quoted_file);
+			    g_strdup_printf (command_usage_def[type].list,
+				             quoted_command, quoted_file);
 	comics_document->offset = command_usage_def[type].offset;
 	if (command_usage_def[type].decompress_tmp) {
 		comics_document->dir = ev_mkdtemp ("evince-comics-XXXXXX", error);
@@ -208,10 +219,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))
@@ -220,6 +231,7 @@ comics_generate_command_lines (ComicsDocument *comics_document,
 			return TRUE;
 	} else {
 		g_free (quoted_file);
+		g_free (quoted_command);
 		return TRUE;
 	}
 
@@ -412,7 +424,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) {
@@ -502,7 +515,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;
@@ -577,7 +590,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;
@@ -807,7 +820,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;