file-roller r2317 - in trunk: . src src/sh

[paobac svn gnome org]

Author: paobac
Date: Wed Jun 11 10:25:23 2008
New Revision: 2317
URL: http://svn.gnome.org/viewvc/file-roller?rev=2317&view=rev

Log:
2008-06-11  Paolo Bacchilega  <paobac svn gnome org>
	
	* src/fr-command-iso.c: 
	
	Do not add the -c switch to sh and don't escape the filename.
	Removed the pipe command from here, since it's been moved to isoinfo.sh

	* src/sh/isoinfo.sh: 
	
	Added an additional argument to specify the output filename when
	extracting.

Modified:
   trunk/ChangeLog
   trunk/src/fr-command-iso.c
   trunk/src/sh/isoinfo.sh

Modified: trunk/src/fr-command-iso.c
==============================================================================
--- trunk/src/fr-command-iso.c	(original)
+++ trunk/src/fr-command-iso.c	Wed Jun 11 10:25:23 2008
@@ -141,10 +141,9 @@
 				      comm);
 
 	fr_process_begin_command (comm->process, "sh");
-	fr_process_add_arg (comm->process, "-c");
 	fr_process_add_arg (comm->process, PRIVEXECDIR "isoinfo.sh");
 	fr_process_add_arg (comm->process, "-i");
-	fr_process_add_arg (comm->process, comm->e_filename);
+	fr_process_add_arg (comm->process, comm->filename);
 	fr_process_add_arg (comm->process, "-l");
 	fr_process_end_command (comm->process);
 
@@ -166,7 +165,6 @@
 	for (scan = file_list; scan; scan = scan->next) {
 		char       *path = scan->data;
 		const char *filename;
-		char       *e_name;
 		char       *file_dir;
 		char       *temp_dest_dir = NULL;
 
@@ -185,18 +183,12 @@
 
 		fr_process_begin_command (comm->process, "sh");
 		fr_process_set_working_dir (comm->process, temp_dest_dir);
-		fr_process_add_arg (comm->process, "-c");
 		fr_process_add_arg (comm->process, PRIVEXECDIR "isoinfo.sh");
 		fr_process_add_arg (comm->process, "-i");
-		fr_process_add_arg (comm->process, comm->e_filename);
+		fr_process_add_arg (comm->process, comm->filename);
 		fr_process_add_arg (comm->process, "-x");
 		fr_process_add_arg (comm->process, path);
-		fr_process_add_arg (comm->process, ">");
-		
-		e_name = g_shell_quote (filename);
-		fr_process_add_arg (comm->process, e_name);
-		g_free (e_name);
-		
+		fr_process_add_arg (comm->process, filename);
 		fr_process_end_command (comm->process);
 
 		g_free (temp_dest_dir);

Modified: trunk/src/sh/isoinfo.sh
==============================================================================
--- trunk/src/sh/isoinfo.sh	(original)
+++ trunk/src/sh/isoinfo.sh	Wed Jun 11 10:25:23 2008
@@ -23,7 +23,8 @@
 
 if test "x$3" = x-x; then
   file_to_extract=$4
-  isoinfo $iso_extensions -i "$filename" -x "$file_to_extract"
+  outfile=$5
+  isoinfo $iso_extensions -i "$filename" -x "$file_to_extract" > "$outfile"
 else
   isoinfo $iso_extensions -i "$filename" -l
 fi