[Xfce4-commits] r22414 - xarchiver/trunk/src

[Giuseppe Torelli]

Author: colossus
Date: 2006-07-12 08:12:54 +0000 (Wed, 12 Jul 2006)
New Revision: 22414

Modified:
   xarchiver/trunk/src/archive.h
   xarchiver/trunk/src/callbacks.c
   xarchiver/trunk/src/iso.c
Log:
Fixed bug #2014, thanks to Michael Cronenworth for reporting it.
Fixed wrong filenames in iso images as a consequence of fixing bug #2005.


Modified: xarchiver/trunk/src/archive.h
===================================================================
--- xarchiver/trunk/src/archive.h       2006-07-11 23:39:26 UTC (rev 22413)
+++ xarchiver/trunk/src/archive.h       2006-07-12 08:12:54 UTC (rev 22414)
@@ -31,7 +31,8 @@
        XARCHIVETYPE_TAR,
        XARCHIVETYPE_TAR_BZ2,
        XARCHIVETYPE_TAR_GZ,
-       XARCHIVETYPE_ZIP
+       XARCHIVETYPE_ZIP,
+       XARCHIVETYPE_COMPRESS
 } XArchiveType;
 
 typedef enum

Modified: xarchiver/trunk/src/callbacks.c
===================================================================
--- xarchiver/trunk/src/callbacks.c     2006-07-11 23:39:26 UTC (rev 22413)
+++ xarchiver/trunk/src/callbacks.c     2006-07-12 08:12:54 UTC (rev 22414)
@@ -850,7 +850,7 @@
     }
        else if ( memcmp ( magic,"\x52\x61\x72\x21",4 ) == 0 ) xx = 
XARCHIVETYPE_RAR;
     else if ( memcmp ( magic,"\x42\x5a\x68",3 ) == 0 ) xx = XARCHIVETYPE_BZIP2;
-       else if ( memcmp ( magic,"\x1f\x8b\x08",3 ) == 0) xx = 
XARCHIVETYPE_GZIP;
+       else if ( memcmp ( magic,"\x1f\x8b\x08",3 == 0 ) || memcmp ( 
magic,"\x1f\x9d",2 ) == 0 )  xx = XARCHIVETYPE_GZIP;
     else if ( memcmp ( magic,"\xed\xab\xee\xdb",4 ) == 0) xx = 
XARCHIVETYPE_RPM;
     else if ( memcmp ( magic,"\x37\x7a\xbc\xaf\x27\x1c",6 ) == 0 ) xx = 
XARCHIVETYPE_7ZIP;
     else if ( isTar ( dummy_ptr ) ) xx = XARCHIVETYPE_TAR;

Modified: xarchiver/trunk/src/iso.c
===================================================================
--- xarchiver/trunk/src/iso.c   2006-07-11 23:39:26 UTC (rev 22413)
+++ xarchiver/trunk/src/iso.c   2006-07-12 08:12:54 UTC (rev 22414)
@@ -645,7 +645,6 @@
 
        while(td)
        {
-               //rootname = td->name;
                parse_dir( td->name , td->extent, td->length, archive);
                xa_append_rows ( archive , 5 );
                g_free (td->name);

_______________________________________________
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits