Author: colossus
Date: 2006-07-12 12:54:19 +0000 (Wed, 12 Jul 2006)
New Revision: 22420
Modified:
xarchiver/trunk/src/callbacks.c
xarchiver/trunk/src/iso.c
Log:
Fixed the wrong magic of gzip compressed file in callbacks.c
Modified: xarchiver/trunk/src/callbacks.c
===================================================================
--- xarchiver/trunk/src/callbacks.c 2006-07-12 10:55:25 UTC (rev 22419)
+++ xarchiver/trunk/src/callbacks.c 2006-07-12 12:54:19 UTC (rev 22420)
@@ -838,7 +838,8 @@
fclose ( dummy_ptr);
return -2;
}
- if ( memcmp ( magic,"\x50\x4b\x03\x04",4 ) == 0 || memcmp (
magic,"\x50\x4b\x05\x06",4 ) == 0 )
+
+ if ( memcmp ( magic,"\x50\x4b\x03\x04",4 ) == 0 || memcmp (
magic,"\x50\x4b\x05\x06",4 ) == 0 )
{
archive->has_passwd = DetectPasswordProtectedArchive (
XARCHIVETYPE_ZIP , dummy_ptr , magic );
xx = XARCHIVETYPE_ZIP;
@@ -850,7 +851,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 ) || memcmp (
magic,"\x1f\x9d",2 ) == 0 ) xx = XARCHIVETYPE_GZIP;
+ else if ( memcmp ( magic,"\x1f\x8b",2) == 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-12 10:55:25 UTC (rev 22419)
+++ xarchiver/trunk/src/iso.c 2006-07-12 12:54:19 UTC (rev 22420)
@@ -576,14 +576,14 @@
if (c & 1024)
{
use_rock = TRUE;
- archive->tmp = g_strdup_printf (_("Rock Ridge - version
%d"),su_version);
+ archive->tmp = g_strdup_printf (_("Rock Ridge version
%d"),su_version);
}
else
archive->tmp = g_strdup (_("Rock Ridge - unknown
version"));
/* This is currently a no op! We need to check the first plain file
instead of the '.' entry in the root directory.*/
if (c & 2048)
- archive->tmp = g_strdup_printf (_("Apple - version
%d"),aa_version);
+ archive->tmp = g_strdup_printf (_("Apple version
%d"),aa_version);
}
/* else
g_print ("NO Rock Ridge present\n"); */
_______________________________________________
Xfce4-commits mailing list
[email protected]
http://foo-projects.org/mailman/listinfo/xfce4-commits
