gvfs r1777 - in trunk: . daemon

[tbzatek svn gnome org]

Author: tbzatek
Date: Thu May 22 14:51:01 2008
New Revision: 1777
URL: http://svn.gnome.org/viewvc/gvfs?rev=1777&view=rev

Log:
Improve error handling allowing to mount non-standard ISO images

Modified:
   trunk/ChangeLog
   trunk/daemon/gvfsbackendarchive.c

Modified: trunk/daemon/gvfsbackendarchive.c
==============================================================================
--- trunk/daemon/gvfsbackendarchive.c	(original)
+++ trunk/daemon/gvfsbackendarchive.c	Thu May 22 14:51:01 2008
@@ -457,8 +457,14 @@
   do
     {
       result = archive_read_next_header (archive->archive, &entry);
-      if (result == ARCHIVE_OK)
+      if (result >= ARCHIVE_WARN && result <= ARCHIVE_OK)
 	{
+  	  if (result < ARCHIVE_OK) {
+  	    DEBUG ("archive_read_next_header: result = %d, error = '%s'\n", result, archive_error_string (archive->archive));
+  	    archive_set_error (archive->archive, ARCHIVE_OK, "No error");
+  	    archive_clear_error (archive->archive);
+	  }
+  
 	  ArchiveFile *file = archive_file_get_from_path (ba->files, 
 	                                                  archive_entry_pathname (entry), 
 							  TRUE);
@@ -600,8 +606,14 @@
   do
     {
       result = archive_read_next_header (archive->archive, &entry);
-      if (result == ARCHIVE_OK)
+      if (result >= ARCHIVE_WARN && result <= ARCHIVE_OK)
         {
+	  if (result < ARCHIVE_OK) {
+	    DEBUG ("do_open_for_read: result = %d, error = '%s'\n", result, archive_error_string (archive->archive));
+	    archive_set_error (archive->archive, ARCHIVE_OK, "No error");
+	    archive_clear_error (archive->archive);
+	  }
+                              
           if (g_str_equal (archive_entry_pathname (entry), filename + 1))
             {
               /* SUCCESS */