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

[Stephan Arts]

Author: stephan
Date: 2007-01-25 13:47:18 +0000 (Thu, 25 Jan 2007)
New Revision: 24747

Modified:
   squeeze/trunk/libsqueeze/archive-support-gnu-tar.c
Log:
gtar output directory recognition fixed

Modified: squeeze/trunk/libsqueeze/archive-support-gnu-tar.c
===================================================================
--- squeeze/trunk/libsqueeze/archive-support-gnu-tar.c	2007-01-25 13:23:01 UTC (rev 24746)
+++ squeeze/trunk/libsqueeze/archive-support-gnu-tar.c	2007-01-25 13:47:18 UTC (rev 24747)
@@ -651,10 +651,23 @@
 			{
 				line[linesize-1] = '\0';
 			}
-
-			temp_filename = line + n; 
+			if(line[0] == 'd')
+			{
+				/* work around for gtar, which does not output trailing slashes with directories */
+				if(line[strlen(line)-1] != '/')
+					temp_filename = g_strconcat(line + n, "/", NULL); 
+				else
+					temp_filename = g_strdup(line + n); 
  
-			entry = lsq_archive_add_file(archive, temp_filename);
+				entry = lsq_archive_add_file(archive, temp_filename);
+				g_free(temp_filename);
+			}
+			else
+			{
+				temp_filename = line + n; 
+ 
+				entry = lsq_archive_add_file(archive, temp_filename);
+			}
 			lsq_archive_iter_set_propsv(archive, entry, (gconstpointer*)props);
 			g_free(line);
 		}