X-Git-Url: https://www.fi.muni.cz/~kas/git//home/kas/public_html/git/?a=blobdiff_plain;ds=sidebyside;f=libdocument%2Fev-file-helpers.c;h=d9b6448418b1739e33196265d76a37f433e5cb89;hb=57df208de1acaf93c60bd8401ec72a7d39f6ad9a;hp=9bf2e463a9852872d92f61ecb8a777e451adfc2e;hpb=b346c5664d27a77e9068ea91eaf9a0c0d6210b0f;p=evince.git

diff --git a/libdocument/ev-file-helpers.c b/libdocument/ev-file-helpers.c
index 9bf2e463..d9b64484 100644
--- a/libdocument/ev-file-helpers.c
+++ b/libdocument/ev-file-helpers.c
@@ -33,6 +33,7 @@
 #include <libgnomevfs/gnome-vfs-utils.h>
 #include <libgnomevfs/gnome-vfs-ops.h>
 #include <libgnomevfs/gnome-vfs-xfer.h>
+#include <libgnome/gnome-init.h>
 
 #include "ev-file-helpers.h"
 
@@ -171,22 +172,21 @@ ev_xfer_uri_simple (const char *from,
 /* Compressed files support */
 #define BZIPCOMMAND "bzip2"
 #define GZIPCOMMAND "gzip"
-#define N_ARGS      5
+#define N_ARGS      4
 #define BUFFER_SIZE 1024
 
-gchar *
-ev_file_uncompress (const gchar       *uri,
-		    EvCompressionType  type,
-		    GError           **error)
+static gchar *
+compression_run (const gchar       *uri,
+		 EvCompressionType  type,
+		 gboolean           compress, 
+		 GError           **error)
 {
 	gchar *argv[N_ARGS];
-	gchar *uri_unc = NULL;
-	gchar *filename, *filename_unc;
+	gchar *uri_dst = NULL;
+	gchar *filename, *filename_dst;
 	gchar *cmd;
 	gint   fd, pout;
 
-	g_return_val_if_fail (uri != NULL, NULL);
-
 	if (type == EV_COMPRESSION_NONE)
 		return NULL;
 
@@ -194,27 +194,25 @@ ev_file_uncompress (const gchar       *uri,
 	if (!cmd)
 		return NULL;
 
-
 	filename = g_filename_from_uri (uri, NULL, NULL);
 	if (!filename) {
 		g_free (cmd);
 		return NULL;
 	}
 	
-	filename_unc = g_build_filename (ev_tmp_dir (), "evinceXXXXXX", NULL);
-	fd = g_mkstemp (filename_unc);
+	filename_dst = g_build_filename (ev_tmp_dir (), "evinceXXXXXX", NULL);
+	fd = g_mkstemp (filename_dst);
 	if (fd < 0) {
 		g_free (cmd);
 		g_free (filename);
-		g_free (filename_unc);
+		g_free (filename_dst);
 		return NULL;
 	}
-	
+
 	argv[0] = cmd;
-	argv[1] = "-cd";
+	argv[1] = compress ? "-c" : "-cd";
 	argv[2] = filename;
-	argv[3] = filename_unc;
-	argv[4] = NULL;
+	argv[3] = NULL;
 
 	if (g_spawn_async_with_pipes (NULL, argv, NULL,
 				      G_SPAWN_STDERR_TO_DEV_NULL,
@@ -246,7 +244,7 @@ ev_file_uncompress (const gchar       *uri,
 				break;
 			}
 		} while (bytes_read > 0);
-		
+
 		g_io_channel_unref (in);
 		g_io_channel_unref (out);
 	}
@@ -254,13 +252,32 @@ ev_file_uncompress (const gchar       *uri,
 	close (fd);
 
 	if (*error == NULL) {
-		uri_unc = g_filename_to_uri (filename_unc,
-					     NULL, NULL);
+		uri_dst = g_filename_to_uri (filename_dst, NULL, NULL);
 	}
 
 	g_free (cmd);
 	g_free (filename);
-	g_free (filename_unc);
+	g_free (filename_dst);
+
+	return uri_dst;
+}
+
+gchar *
+ev_file_uncompress (const gchar       *uri,
+		    EvCompressionType  type,
+		    GError           **error)
+{
+	g_return_val_if_fail (uri != NULL, NULL);
+
+	return compression_run (uri, type, FALSE, error);
+}
+
+gchar *
+ev_file_compress (const gchar       *uri,
+		  EvCompressionType  type,
+		  GError           **error)
+{
+	g_return_val_if_fail (uri != NULL, NULL);
 
-	return uri_unc;
+	return compression_run (uri, type, TRUE, error);
 }