[Xfce4-commits] r25325 - squeeze/trunk/libsqueeze

[Stephan Arts]

Author: stephan
Date: 2007-03-28 14:05:19 +0000 (Wed, 28 Mar 2007)
New Revision: 25325

Modified:
   squeeze/trunk/libsqueeze/command-builder-gnu-tar.c
   squeeze/trunk/libsqueeze/command-builder-rar.c
   squeeze/trunk/libsqueeze/command-builder-zip.c
Log:
fix extraction of selected items for rar, and gnu-tar (zip is still todo, needs appending * to folders)

Modified: squeeze/trunk/libsqueeze/command-builder-gnu-tar.c
===================================================================
--- squeeze/trunk/libsqueeze/command-builder-gnu-tar.c	2007-03-28 13:53:18 UTC (rev 25324)
+++ squeeze/trunk/libsqueeze/command-builder-gnu-tar.c	2007-03-28 14:05:19 UTC (rev 25325)
@@ -337,9 +337,9 @@
 }
 
 static LSQArchiveCommand *
-lsq_command_builder_gnu_tar_build_extract(LSQCommandBuilder *builder, LSQArchive *archive, const gchar *dest_path, GSList *filenames)
+lsq_command_builder_gnu_tar_build_extract(LSQCommandBuilder *builder, LSQArchive *archive, const gchar *dest_path, GSList *file_iters)
 {
-	gchar *files = lsq_concat_filenames(filenames);
+	gchar *files = lsq_concat_iter_filenames(file_iters);
 	gchar *options = g_strconcat(" -C ", dest_path, NULL);
 
 	LSQArchiveCommand *spawn = lsq_spawn_command_new(_("Extracting"), archive, "tar %3$s -x -f %1$s %2$s", files, options, NULL);

Modified: squeeze/trunk/libsqueeze/command-builder-rar.c
===================================================================
--- squeeze/trunk/libsqueeze/command-builder-rar.c	2007-03-28 13:53:18 UTC (rev 25324)
+++ squeeze/trunk/libsqueeze/command-builder-rar.c	2007-03-28 14:05:19 UTC (rev 25325)
@@ -182,9 +182,9 @@
 }
 
 static LSQArchiveCommand *
-lsq_command_builder_rar_build_extract(LSQCommandBuilder *builder, LSQArchive *archive, const gchar *dest_path, GSList *filenames)
+lsq_command_builder_rar_build_extract(LSQCommandBuilder *builder, LSQArchive *archive, const gchar *dest_path, GSList *file_iters)
 {
-	gchar *files = lsq_concat_filenames(filenames);
+	gchar *files = lsq_concat_iter_filenames(file_iters);
 	gchar *options = g_strconcat(dest_path, NULL);
 
 	LSQArchiveCommand *spawn = lsq_spawn_command_new(_("Extracting"), archive, "unrar x -y %1$s %2$s %3$s", files, options, NULL);

Modified: squeeze/trunk/libsqueeze/command-builder-zip.c
===================================================================
--- squeeze/trunk/libsqueeze/command-builder-zip.c	2007-03-28 13:53:18 UTC (rev 25324)
+++ squeeze/trunk/libsqueeze/command-builder-zip.c	2007-03-28 14:05:19 UTC (rev 25325)
@@ -167,9 +167,9 @@
 }
 
 static LSQArchiveCommand *
-lsq_command_builder_zip_build_extract(LSQCommandBuilder *builder, LSQArchive *archive, const gchar *dest_path, GSList *filenames)
+lsq_command_builder_zip_build_extract(LSQCommandBuilder *builder, LSQArchive *archive, const gchar *dest_path, GSList *file_iters)
 {
-	gchar *files = lsq_concat_filenames(filenames);
+	gchar *files = lsq_concat_iter_filenames(file_iters);
 	gchar *options = g_strconcat(" -d ", dest_path, NULL);
 
 	LSQArchiveCommand *spawn = lsq_spawn_command_new(_("Extracting"), archive, "unzip -o %1$s %2$s %3$s", files, options, NULL);