Separate archiving and networking mode

4 files changed, 39 insertions, 39 deletions

diff --git a/gvfs/gvfs.c b/gvfs/gvfs.c
index 55e0d9b..7b15b5e 100644
--- a/gvfs/gvfs.c
+++ b/gvfs/gvfs.c
@@ -31,8 +31,8 @@
 
 
 
-#define VERSION "0.1.9"
-#define BUILD_DATE "2009-10-24"
+#define VERSION "0.1.10"
+#define BUILD_DATE "2009-10-25"
 #define DEFAULT_BLOCK_SIZE 0x10000   /* 64kB */
 
 #define CONST_DEFAULT_QUERY_INFO_ATTRIBUTES     G_FILE_ATTRIBUTE_STANDARD_TYPE "," G_FILE_ATTRIBUTE_STANDARD_NAME "," \
@@ -387,7 +387,7 @@ VFSGetNetworkServices ()
 }
 
 TVFSResult
-VFSOpen (struct TVFSGlobs *globs, char *sName)
+VFSOpenURI (struct TVFSGlobs *globs, char *sURI)
 {
   GFile *f, *f2;
   GFileInfo *info;
@@ -397,13 +397,13 @@ VFSOpen (struct TVFSGlobs *globs, char *sName)
   globs->file = NULL;
   globs->ftp_anonymous = FALSE;
 
-  if (strstr (sName, "@") == NULL) {
+  if (strstr (sURI, "@") == NULL) {
     /*  test for FTP protocol (we only enable anonymous here)  */
-    globs->ftp_anonymous = strcasestr (sName, "ftp://") == sName;
+    globs->ftp_anonymous = strcasestr (sURI, "ftp://") == sURI;
   }
 
-  g_print ("(II) VFSOpen: opening URI '%s'\n", sName);
-  f = g_file_new_for_commandline_arg (sName);
+  g_print ("(II) VFSOpenURI: opening URI '%s'\n", sURI);
+  f = g_file_new_for_commandline_arg (sURI);
 
   while (1) {
     error = NULL;
@@ -432,7 +432,7 @@ VFSOpen (struct TVFSGlobs *globs, char *sName)
     }
     /*  Any other errors --> report  */
     if (error) {
-      g_print ("(EE) VFSOpen: g_file_query_info() error: %s\n", error->message);
+      g_print ("(EE) VFSOpenURI: g_file_query_info() error: %s\n", error->message);
       res = g_error_to_TVFSResult (error);
       g_error_free (error);
       g_object_unref (f);
diff --git a/libarchive/libarchive.c b/libarchive/libarchive.c
index dd752cf..eadda05 100644
--- a/libarchive/libarchive.c
+++ b/libarchive/libarchive.c
@@ -1,5 +1,5 @@
 /*  libarchive plugin for Tux Commander
- *   version 0.1.4, designed for libarchive 2.5.5
+ *   version 0.1.5, designed for libarchive 2.5.5
  *  Copyright (C) 2008 Tomas Bzatek <tbzatek@users.sourceforge.net>
  *   Check for updates on tuxcmd.sourceforge.net
  *
@@ -47,8 +47,8 @@
 
 
 
-#define VERSION "0.1.4"
-#define BUILD_DATE "2009-10-24"
+#define VERSION "0.1.5"
+#define BUILD_DATE "2009-10-25"
 #define DEFAULT_BLOCK_SIZE 65536
 
 
@@ -192,14 +192,14 @@ static TVFSResult libarchive_open(struct archive **a, const char *filename, size
 
 
 
-TVFSResult VFSOpen(struct TVFSGlobs *globs, char *sName)
+TVFSResult VFSOpenArchive(struct TVFSGlobs *globs, char *sName)
 {
   globs->files = filelist_tree_new();
   globs->vfs_filelist = vfs_filelist_new(globs->files);
   globs->curr_dir = NULL;
   globs->archive_path = strdup(sName);
   globs->total_size = 0;
-  fprintf(stderr, "(--) VFSOpen: trying to open archive '%s'...\n", globs->archive_path);
+  fprintf(stderr, "(--) VFSOpenArchive: trying to open archive '%s'...\n", globs->archive_path);
 
   TVFSResult Result;
   struct archive *a;
@@ -216,10 +216,10 @@ TVFSResult VFSOpen(struct TVFSGlobs *globs, char *sName)
 				break;
 			} else
 			if (r == ARCHIVE_WARN) {
-				log("(WW) VFSOpen: file '%s' - libarchive warning: '%s'\n", archive_entry_pathname(entry), archive_error_string(a));
+				log("(WW) VFSOpenArchive: file '%s' - libarchive warning: '%s'\n", archive_entry_pathname(entry), archive_error_string(a));
 			} else
 			if (r != ARCHIVE_OK) {
-				fprintf(stderr, "(EE) VFSOpen: error occured while reading archive: '%s'\n", archive_error_string(a));
+				fprintf(stderr, "(EE) VFSOpenArchive: error occured while reading archive: '%s'\n", archive_error_string(a));
 				Result = cVFS_Failed;
 				break;
 			}
@@ -271,7 +271,7 @@ TVFSResult VFSOpen(struct TVFSGlobs *globs, char *sName)
 		archive_read_close(a);
   }
   archive_read_finish(a);
-  fprintf(stderr, "(II) VFSOpen: done. \n");
+  fprintf(stderr, "(II) VFSOpenArchive: done. \n");
 
   /* FIXME: temporarily disabled */
 //  filelist_tree_resolve_symlinks(globs->files);
diff --git a/unrar/unrar.c b/unrar/unrar.c
index 1bd0b98..0db1493 100644
--- a/unrar/unrar.c
+++ b/unrar/unrar.c
@@ -1,5 +1,5 @@
 /*  UNRAR plugin for Tux Commander
- *   version 0.3.6, designed for unrar v3.8.2
+ *   version 0.3.7, designed for unrar v3.8.2
  *  Copyright (C) 2008 Tomas Bzatek <tbzatek@users.sourceforge.net>
  *   Check for updates on tuxcmd.sourceforge.net
  *
@@ -55,8 +55,8 @@ enum HOST_SYSTEM {
 };
 
 
-#define VERSION "0.3.6"
-#define BUILD_DATE "2009-10-24"
+#define VERSION "0.3.7"
+#define BUILD_DATE "2009-10-25"
 #define DEFAULT_BLOCK_SIZE 65536
 
 
@@ -307,7 +307,7 @@ time_t rar_time_to_unix(unsigned int FileTime)
 }
 
 
-TVFSResult VFSOpen(struct TVFSGlobs *globs, char *sName)
+TVFSResult VFSOpenArchive(struct TVFSGlobs *globs, char *sName)
 {
   TVFSResult Result = cVFS_OK;
 
@@ -318,7 +318,7 @@ TVFSResult VFSOpen(struct TVFSGlobs *globs, char *sName)
   globs->total_size = 0;
   globs->failed_passwd_callback = FALSE;
   globs->volume_missing_abort = FALSE;
-  fprintf(stderr, "(--) VFSOpen: trying to open archive '%s'...\n", globs->archive_path);
+  fprintf(stderr, "(--) VFSOpenArchive: trying to open archive '%s'...\n", globs->archive_path);
 
   HANDLE PASCAL handle;
   struct RAROpenArchiveDataEx *archive_data;
@@ -344,7 +344,7 @@ TVFSResult VFSOpen(struct TVFSGlobs *globs, char *sName)
 //	  RARSetProcessDataProc(handle, unrar_process_data_proc);
 
 	  if (globs->password) {
-		  fprintf(stderr, "(II) VFSOpen: Setting password... \n");
+		  fprintf(stderr, "(II) VFSOpenArchive: Setting password... \n");
 		  RARSetPassword(handle, globs->password);
 	  }
 
@@ -408,7 +408,7 @@ TVFSResult VFSOpen(struct TVFSGlobs *globs, char *sName)
 	  }
 //	  printf("\nRARReadHeader result = %d\n", res);
 	  if (res != ERAR_END_ARCHIVE || globs->volume_missing_abort) {
-		  fprintf(stderr, "(EE) VFSOpen: RARReadHeader result = %d\n", res);
+		  fprintf(stderr, "(EE) VFSOpenArchive: RARReadHeader result = %d\n", res);
 		  Result = cVFS_Failed;
 		  if ((res == ERAR_MISSING_PASSWORD) || ((res == ERAR_BAD_DATA) && (globs->failed_passwd_callback)))
 			  Result = cVFS_BadPassword;
@@ -417,15 +417,15 @@ TVFSResult VFSOpen(struct TVFSGlobs *globs, char *sName)
 
 	  res = RARCloseArchive(handle);
 	  if (res) {
-		  fprintf(stderr, "(EE) VFSOpen: RARCloseArchive result = %d\n", res);
+		  fprintf(stderr, "(EE) VFSOpenArchive: RARCloseArchive result = %d\n", res);
 	  }
   } else {
-	  fprintf(stderr, "(EE) VFSOpen: error occured when opening archive: OpenResult = %d\n", archive_data->OpenResult);
+	  fprintf(stderr, "(EE) VFSOpenArchive: error occured when opening archive: OpenResult = %d\n", archive_data->OpenResult);
 	  Result = cVFS_Failed;
   }
 
   free(archive_data);
-  fprintf(stderr, "(II) VFSOpen: done. \n");
+  fprintf(stderr, "(II) VFSOpenArchive: done. \n");
   if (globs->need_password) printf("Password present.\n");
   printf("\n\nList of items:\n");
   filelist_tree_print(globs->files);
diff --git a/zip/zip.cpp b/zip/zip.cpp
index 88f7ec9..8998d8b 100644
--- a/zip/zip.cpp
+++ b/zip/zip.cpp
@@ -1,5 +1,5 @@
 /*  ZIP plugin for Tux Commander
- *   version 0.5.5, designed for ZipArchive v3.2.0
+ *   version 0.5.6, designed for ZipArchive v3.2.0
  *  Copyright (C) 2008 Tomas Bzatek <tbzatek@users.sourceforge.net>
  *   Check for updates on tuxcmd.sourceforge.net
  *
@@ -47,8 +47,8 @@
 
 
 
-#define VERSION "0.5.5"
-#define BUILD_DATE "2009-10-24"
+#define VERSION "0.5.6"
+#define BUILD_DATE "2009-10-25"
 #define DEFAULT_BLOCK_SIZE 65536
 
 
@@ -312,7 +312,7 @@ VFSGetArchiveExts()
 /**************************************************************************************************************************************/
 /**************************************************************************************************************************************/
 
-TVFSResult VFSOpen(struct TVFSGlobs *globs, char *sName)
+TVFSResult VFSOpenArchive(struct TVFSGlobs *globs, char *sName)
 {
   //  Initialize the objects
   globs->files = NULL;
@@ -323,30 +323,30 @@ TVFSResult VFSOpen(struct TVFSGlobs *globs, char *sName)
 
   try
   {
-    fprintf(stderr, "(--) VFSOpen: trying to open the file...\n");
+    fprintf(stderr, "(--) VFSOpenArchive: trying to open the file...\n");
 
     try {
       if (! globs->zip->Open(sName, CZipArchive::zipOpen, 0)) {
-          printf("(EE) VFSOpen: error opening zip archive\n");
+          printf("(EE) VFSOpenArchive: error opening zip archive\n");
           return cVFS_Failed;
       }
     }
     catch (...) {
-      printf("(!!) VFSOpen: error opening readwrite zip, trying readonly...\n");
+      printf("(!!) VFSOpenArchive: error opening readwrite zip, trying readonly...\n");
       try {
         // try to open in read only mode (required if there's no write access on the media)
         if (! globs->zip->Open(sName, CZipArchive::zipOpenReadOnly, 0)) {
-            printf("(EE) VFSOpen: error opening readonly zip archive\n");
+            printf("(EE) VFSOpenArchive: error opening readonly zip archive\n");
             return cVFS_Failed;
         }
       }
       catch (...) {
-        printf("(EE) VFSOpen: error opening readonly zip\n");
+        printf("(EE) VFSOpenArchive: error opening readonly zip\n");
         return cVFS_Failed;
       }
     }
     int iCount = globs->zip->GetCount(false);
-    printf("(II) VFSOpen: %i records found, %i files.\n", iCount, globs->zip->GetCount(true));
+    printf("(II) VFSOpenArchive: %i records found, %i files.\n", iCount, globs->zip->GetCount(true));
     if (iCount < 1) return cVFS_Failed;
 
     //  Build the global file list
@@ -362,14 +362,14 @@ TVFSResult VFSOpen(struct TVFSGlobs *globs, char *sName)
     globs->zip->SetAutoFlush(true);
   }
   catch (CZipException e) {
-    printf ("(EE) VFSOpen: Error while processing archive %s\n%s\n", (LPCTSTR) sName, (LPCTSTR)e.GetErrorDescription());
+    printf ("(EE) VFSOpenArchive: Error while processing archive %s\n%s\n", (LPCTSTR) sName, (LPCTSTR)e.GetErrorDescription());
     if (e.m_szFileName.IsEmpty()) printf("\n");
-    else printf("(EE) VFSOpen: Filename in error object: %s\n\n", (LPCTSTR)e.m_szFileName);
+    else printf("(EE) VFSOpenArchive: Filename in error object: %s\n\n", (LPCTSTR)e.m_szFileName);
     globs->zip->Close(true);
     return cVFS_Failed;
   }
   catch (...) {
-    printf ("(EE) VFSOpen: Unknown error while processing archive %s\n\n", (LPCTSTR) sName);
+    printf ("(EE) VFSOpenArchive: Unknown error while processing archive %s\n\n", (LPCTSTR) sName);
     globs->zip->Close(true);
     return cVFS_Failed;
   }