Rename VFSCopyOut and VFSCopyIn functions

4 files changed, 64 insertions, 64 deletions

diff --git a/gvfs/gvfs.c b/gvfs/gvfs.c
index 0d0c318..197fca3 100644
--- a/gvfs/gvfs.c
+++ b/gvfs/gvfs.c
@@ -1326,7 +1326,7 @@ vfs_copy_progress_callback (goffset current_num_bytes,
 #define TUXCMD_DEFAULT_COPY_FLAGS G_FILE_COPY_OVERWRITE | G_FILE_COPY_NOFOLLOW_SYMLINKS | G_FILE_COPY_ALL_METADATA
 
 TVFSResult
-VFSCopyOut (struct TVFSGlobs *globs, const char *sSrcName, const char *sDstName, gboolean Append)
+VFSCopyToLocal (struct TVFSGlobs *globs, const char *sSrcName, const char *sDstName, gboolean Append)
 {
   GFile *src, *dst;
   GError *error;
@@ -1334,20 +1334,20 @@ VFSCopyOut (struct TVFSGlobs *globs, const char *sSrcName, const char *sDstName,
 
 
   if (globs->file == NULL) {
-    g_print ("(EE) VFSCopyOut: globs->file == NULL !\n");
+    g_print ("(EE) VFSCopyToLocal: globs->file == NULL !\n");
     return cVFS_Failed;
   }
 
-  g_print ("(II) VFSCopyOut: '%s' --> '%s'\n", sSrcName, sDstName);
+  g_print ("(II) VFSCopyToLocal: '%s' --> '%s'\n", sSrcName, sDstName);
 
   src = g_file_resolve_relative_path (globs->file, sSrcName);
   if (src == NULL) {
-    g_print ("(EE) VFSCopyOut: g_file_resolve_relative_path() failed.\n");
+    g_print ("(EE) VFSCopyToLocal: g_file_resolve_relative_path() failed.\n");
     return cVFS_Failed;
   }
   dst = g_file_new_for_path (sDstName);
   if (dst == NULL) {
-    g_print ("(EE) VFSCopyOut: g_file_resolve_relative_path() failed.\n");
+    g_print ("(EE) VFSCopyToLocal: g_file_resolve_relative_path() failed.\n");
     return cVFS_Failed;
   }
 
@@ -1357,7 +1357,7 @@ VFSCopyOut (struct TVFSGlobs *globs, const char *sSrcName, const char *sDstName,
   error = NULL;
   g_file_copy (src, dst, TUXCMD_DEFAULT_COPY_FLAGS, globs->cancellable, vfs_copy_progress_callback, globs, &error);
   if (error) {
-    g_print ("(EE) VFSCopyOut: g_file_copy() error: %s\n", error->message);
+    g_print ("(EE) VFSCopyToLocal: g_file_copy() error: %s\n", error->message);
 //    res = g_error_to_TVFSResult (error);
     if (error->code == G_IO_ERROR_CANCELLED)
       res = cVFS_Cancelled;
@@ -1372,7 +1372,7 @@ VFSCopyOut (struct TVFSGlobs *globs, const char *sSrcName, const char *sDstName,
 }
 
 TVFSResult
-VFSCopyIn (struct TVFSGlobs *globs, const char *sSrcName, const char *sDstName, gboolean Append)
+VFSCopyFromLocal (struct TVFSGlobs *globs, const char *sSrcName, const char *sDstName, gboolean Append)
 {
   GFile *src, *dst;
   GError *error;
@@ -1380,20 +1380,20 @@ VFSCopyIn (struct TVFSGlobs *globs, const char *sSrcName, const char *sDstName,
 
 
   if (globs->file == NULL) {
-    g_print ("(EE) VFSCopyIn: globs->file == NULL !\n");
+    g_print ("(EE) VFSCopyFromLocal: globs->file == NULL !\n");
     return cVFS_Failed;
   }
 
-  g_print ("(II) VFSCopyIn: '%s' --> '%s'\n", sSrcName, sDstName);
+  g_print ("(II) VFSCopyFromLocal: '%s' --> '%s'\n", sSrcName, sDstName);
 
   src = g_file_new_for_path (sSrcName);
   if (src == NULL) {
-    g_print ("(EE) VFSCopyIn: g_file_resolve_relative_path() failed.\n");
+    g_print ("(EE) VFSCopyFromLocal: g_file_resolve_relative_path() failed.\n");
     return cVFS_Failed;
   }
   dst = g_file_resolve_relative_path (globs->file, sDstName);
   if (dst == NULL) {
-    g_print ("(EE) VFSCopyIn: g_file_resolve_relative_path() failed.\n");
+    g_print ("(EE) VFSCopyFromLocal: g_file_resolve_relative_path() failed.\n");
     return cVFS_Failed;
   }
 
@@ -1404,7 +1404,7 @@ VFSCopyIn (struct TVFSGlobs *globs, const char *sSrcName, const char *sDstName,
   /* FIXME: Appending not supported */
   g_file_copy (src, dst, TUXCMD_DEFAULT_COPY_FLAGS, globs->cancellable, vfs_copy_progress_callback, globs, &error);
   if (error) {
-    g_print ("(EE) VFSCopyIn: g_file_copy() error: %s\n", error->message);
+    g_print ("(EE) VFSCopyFromLocal: g_file_copy() error: %s\n", error->message);
 //    res = g_error_to_TVFSResult (error);
     if (error->code == G_IO_ERROR_CANCELLED)
       res = cVFS_Cancelled;
@@ -1424,7 +1424,7 @@ VFSCopyIn (struct TVFSGlobs *globs, const char *sSrcName, const char *sDstName,
  * TODO:
  *        NOT NEEDED - block size settings for GIO subsystem
  *        NOT NEEDED - variable block size for different protocols?
- *        - support for appending in VFSCopyIn
+ *        - support for appending in VFSCopyFromLocal
  *        DONE- authentication improvements (needs new VFS API)
  *
  ***/
diff --git a/libarchive/libarchive.c b/libarchive/libarchive.c
index 11f680d..956a216 100644
--- a/libarchive/libarchive.c
+++ b/libarchive/libarchive.c
@@ -578,27 +578,27 @@ my_archive_read_data_into_fd(struct TVFSGlobs *globs, struct archive *a, struct
 }
 
 
-TVFSResult VFSCopyOut(struct TVFSGlobs *globs, const char *sSrcName, const char *sDstName, int Append)
+TVFSResult VFSCopyToLocal(struct TVFSGlobs *globs, const char *sSrcName, const char *sDstName, int Append)
 {
   if ((sSrcName == NULL)  || (sDstName == NULL) || (strlen(sSrcName) < 1) || (strlen(sDstName) < 1)) {
-    printf("(EE) VFSCopyOut: The value of 'sSrcName' or 'sDstName' is NULL or empty\n");
+    printf("(EE) VFSCopyToLocal: The value of 'sSrcName' or 'sDstName' is NULL or empty\n");
     return cVFS_Failed;
   }
 
-  printf("(II) VFSCopyOut: copying file '%s' out to '%s'\n", sSrcName, sDstName);
+  printf("(II) VFSCopyToLocal: copying file '%s' out to '%s'\n", sSrcName, sDstName);
 
   struct PathTree *node = filelist_tree_find_node_by_path(globs->files, sSrcName);
   if (! node) {
-    fprintf(stderr, "(EE) VFSCopyOut: cannot find file '%s'\n", sSrcName);
+    fprintf(stderr, "(EE) VFSCopyToLocal: cannot find file '%s'\n", sSrcName);
     return cVFS_ReadErr;
   }
 
   const char *src = node->original_pathstr;
   if (! src) {
-    fprintf(stderr, "(WW) VFSCopyOut: cannot determine original filename\n");
+    fprintf(stderr, "(WW) VFSCopyToLocal: cannot determine original filename\n");
     src = sSrcName;
   }
-  printf("(II) VFSCopyOut: new src path: '%s'\n", src);
+  printf("(II) VFSCopyToLocal: new src path: '%s'\n", src);
 
 
   TVFSResult Result;
@@ -620,7 +620,7 @@ TVFSResult VFSCopyOut(struct TVFSGlobs *globs, const char *sSrcName, const char
 				log("(WW) VFSOpen: file '%s' - libarchive warning: '%s'\n", archive_entry_pathname(entry), archive_error_string(a));
 			} else
 			if (r != ARCHIVE_OK) {
-				fprintf(stderr, "(EE) VFSCopyOut: error occured while reading archive: '%s'\n", archive_error_string(a));
+				fprintf(stderr, "(EE) VFSCopyToLocal: error occured while reading archive: '%s'\n", archive_error_string(a));
 				Result = cVFS_Failed;
 				break;
 			}
@@ -634,7 +634,7 @@ TVFSResult VFSCopyOut(struct TVFSGlobs *globs, const char *sSrcName, const char
 //			printf ("strcmp: '%s' vs. '%s'\n", ssrc, asrc);
 			if (strcmp(ssrc, asrc) == 0) {
 //				printf("--> found file, extracting\n");
-				fprintf(stderr, "(II) VFSCopyOut: extract_file_path(sDstName) = '%s', extract_file_name(sDstName) = '%s' \n", extract_file_path(sDstName), extract_file_name(sDstName));
+				fprintf(stderr, "(II) VFSCopyToLocal: extract_file_path(sDstName) = '%s', extract_file_name(sDstName) = '%s' \n", extract_file_path(sDstName), extract_file_name(sDstName));
 				found = TRUE;
 
 				Result = my_archive_read_data_into_fd(globs, a, entry, sDstName, globs->block_size, Append);
@@ -646,17 +646,17 @@ TVFSResult VFSCopyOut(struct TVFSGlobs *globs, const char *sSrcName, const char
   archive_read_finish(a);
 
   if ((! found) && Result == cVFS_OK) {
-    fprintf(stderr, "(EE) VFSCopyOut: file not found in archive.\n");
+    fprintf(stderr, "(EE) VFSCopyToLocal: file not found in archive.\n");
     Result = cVFS_ReadErr;
   }
 
-  fprintf(stderr, "(II) VFSCopyOut: finished. \n");
+  fprintf(stderr, "(II) VFSCopyToLocal: finished. \n");
   return Result;
 }
 
-TVFSResult VFSCopyIn(struct TVFSGlobs *globs, const char *sSrcName, const char *sDstName, int Append)
+TVFSResult VFSCopyFromLocal(struct TVFSGlobs *globs, const char *sSrcName, const char *sDstName, int Append)
 {
-  printf("(WW) VFSCopyIn: Not supported in libarchive plugin.\n");
+  printf("(WW) VFSCopyFromLocal: Not supported in libarchive plugin.\n");
   return cVFS_Not_Supported;
 }
 
diff --git a/unrar/unrar.c b/unrar/unrar.c
index 7f6c1e4..c4870ea 100644
--- a/unrar/unrar.c
+++ b/unrar/unrar.c
@@ -659,18 +659,18 @@ int VFSTwoSameFiles(struct TVFSGlobs *globs, const char *Path1, const char *Path
 ////////////////////////
 
 
-TVFSResult VFSCopyOut(struct TVFSGlobs *globs, const char *sSrcName, const char *sDstName, int Append)
+TVFSResult VFSCopyToLocal(struct TVFSGlobs *globs, const char *sSrcName, const char *sDstName, int Append)
 {
   if ((sSrcName == NULL)  || (sDstName == NULL) || (strlen(sSrcName) < 1) || (strlen(sDstName) < 1)) {
-    printf("(EE) VFSCopyOut: The value of 'sSrcName' or 'sDstName' is NULL or empty\n");
+    printf("(EE) VFSCopyToLocal: The value of 'sSrcName' or 'sDstName' is NULL or empty\n");
     return cVFS_Failed;
   }
 
-  printf("(II) VFSCopyOut: copying file '%s' out to '%s'\n", sSrcName, sDstName);
+  printf("(II) VFSCopyToLocal: copying file '%s' out to '%s'\n", sSrcName, sDstName);
 
   struct PathTree *node = filelist_tree_find_node_by_path(globs->files, sSrcName);
   if (! node) {
-    fprintf(stderr, "(EE) VFSCopyOut: cannot find file '%s'\n", sSrcName);
+    fprintf(stderr, "(EE) VFSCopyToLocal: cannot find file '%s'\n", sSrcName);
     return cVFS_ReadErr;
   }
 
@@ -679,11 +679,11 @@ TVFSResult VFSCopyOut(struct TVFSGlobs *globs, const char *sSrcName, const char
 
   char *src = node->original_pathstr;
   if (! src) {
-    fprintf(stderr, "(WW) VFSCopyOut: cannot determine original filename\n");
+    fprintf(stderr, "(WW) VFSCopyToLocal: cannot determine original filename\n");
     src = (char *)sSrcName;
   }
 
-  printf("(II) VFSCopyOut: new src path: '%s'\n", src);
+  printf("(II) VFSCopyToLocal: new src path: '%s'\n", src);
 
   HANDLE PASCAL handle;
   struct RAROpenArchiveDataEx *archive_data;
@@ -711,7 +711,7 @@ TVFSResult VFSCopyOut(struct TVFSGlobs *globs, const char *sSrcName, const char
 //	  RARSetProcessDataProc(handle, unrar_process_data_proc);
 
 	  if (globs->password) {
-		  printf("(II) VFSCopyOut: Setting password... \n");
+		  printf("(II) VFSCopyToLocal: Setting password... \n");
 		  RARSetPassword(handle, globs->password);
 	  }
 
@@ -729,7 +729,7 @@ TVFSResult VFSCopyOut(struct TVFSGlobs *globs, const char *sSrcName, const char
 		  if (IS_DIR_SEP(*ssrc))  ssrc++;
 		  if (IS_DIR_SEP(*asrc))  asrc++;
 		  if (strcmp(ssrc, asrc) == 0) {
-//			  fprintf(stderr, "(II) VFSCopyOut: extract_file_path(sDstName) = '%s', extract_file_name(sDstName) = '%s' \n", extract_file_path(sDstName), extract_file_name(sDstName));
+//			  fprintf(stderr, "(II) VFSCopyToLocal: extract_file_path(sDstName) = '%s', extract_file_name(sDstName) = '%s' \n", extract_file_path(sDstName), extract_file_name(sDstName));
 			  globs->extract_done = 0;
 			  globs->extract_file_size = (int64_t)((int64_t)(header->UnpSizeHigh * 0x100000000) + (int64_t)header->UnpSize);
 			  globs->extract_cancelled = FALSE;
@@ -738,19 +738,19 @@ TVFSResult VFSCopyOut(struct TVFSGlobs *globs, const char *sSrcName, const char
 			  int res2 = RARProcessFile(handle, RAR_EXTRACT, NULL, (char *)sDstName);
 
 			  if (globs->extract_cancelled) {
-                            fprintf(stderr, "(WW) VFSCopyOut: cancelled !\n");
+                            fprintf(stderr, "(WW) VFSCopyToLocal: cancelled !\n");
 			    Result = cVFS_Cancelled;
 			  }
 			  else
 			  if (res2) {
-				  fprintf(stderr, "(EE) VFSCopyOut: RARProcessFile result = %d\n", res2);
+				  fprintf(stderr, "(EE) VFSCopyToLocal: RARProcessFile result = %d\n", res2);
 				  Result = cVFS_ReadErr;
 			  }
 			  break;
 		  } else {
 			  int res2 = RARProcessFile(handle, RAR_SKIP, NULL, NULL);
 			  if (res2) {
-				  fprintf(stderr, "(EE) VFSCopyOut: RARProcessFile result = %d\n", res2);
+				  fprintf(stderr, "(EE) VFSCopyToLocal: RARProcessFile result = %d\n", res2);
 				  Result = cVFS_ReadErr;
 			  }
 		  }
@@ -758,11 +758,11 @@ TVFSResult VFSCopyOut(struct TVFSGlobs *globs, const char *sSrcName, const char
 
 	  if ((res != ERAR_END_ARCHIVE) && (res)) {
                   if (globs->extract_cancelled) {
-                    fprintf(stderr, "(WW) VFSCopyOut: cancelled !\n");
+                    fprintf(stderr, "(WW) VFSCopyToLocal: cancelled !\n");
                     Result = cVFS_Cancelled;
                   }
                   else {
-                    fprintf(stderr, "(EE) VFSCopyOut: RARReadHeader result = %d\n", res);
+                    fprintf(stderr, "(EE) VFSCopyToLocal: RARReadHeader result = %d\n", res);
                     switch (res) {
                           case ERAR_NO_MEMORY:
                           case ERAR_SMALL_BUF:
@@ -799,28 +799,28 @@ TVFSResult VFSCopyOut(struct TVFSGlobs *globs, const char *sSrcName, const char
 
 	  res = RARCloseArchive(handle);
 	  if (res) {
-		  fprintf(stderr, "(EE) VFSCopyOut: RARCloseArchive result = %d\n", res);
+		  fprintf(stderr, "(EE) VFSCopyToLocal: RARCloseArchive result = %d\n", res);
 		  Result = cVFS_ReadErr;
 	  }
   } else {
-	  fprintf(stderr, "(EE) VFSCopyOut: error occured when opening archive: OpenResult = %d\n", archive_data->OpenResult);
+	  fprintf(stderr, "(EE) VFSCopyToLocal: error occured when opening archive: OpenResult = %d\n", archive_data->OpenResult);
 	  Result = cVFS_ReadErr;
   }
 
   free(archive_data);
 
   if ((! found) && Result == cVFS_OK) {
-    fprintf(stderr, "(EE) VFSCopyOut: file not found in archive.\n");
+    fprintf(stderr, "(EE) VFSCopyToLocal: file not found in archive.\n");
     Result = cVFS_ReadErr;
   }
 
-  fprintf(stderr, "(II) VFSCopyOut: finished. \n");
+  fprintf(stderr, "(II) VFSCopyToLocal: finished. \n");
   return Result;
 }
 
-TVFSResult VFSCopyIn(struct TVFSGlobs *globs, const char *sSrcName, const char *sDstName, int Append)
+TVFSResult VFSCopyFromLocal(struct TVFSGlobs *globs, const char *sSrcName, const char *sDstName, int Append)
 {
-  printf("(WW) VFSCopyIn: Not supported in UNRAR plugin.\n");
+  printf("(WW) VFSCopyFromLocal: Not supported in UNRAR plugin.\n");
   return cVFS_Not_Supported;
 }
 
diff --git a/zip/zip.cpp b/zip/zip.cpp
index 07e20a4..23d8350 100644
--- a/zip/zip.cpp
+++ b/zip/zip.cpp
@@ -881,20 +881,20 @@ int VFSTwoSameFiles(struct TVFSGlobs *globs, const char *Path1, const char *Path
 
 
 //  Known issues: - crashes when no space left on NFS mounts, probably unhandled exception in further ZipArchive code (repro: Gentoo, Ubuntu)
-TVFSResult VFSCopyOut(struct TVFSGlobs *globs, const char *sSrcName, const char *sDstName, int Append)
+TVFSResult VFSCopyToLocal(struct TVFSGlobs *globs, const char *sSrcName, const char *sDstName, int Append)
 {
   gboolean try_again;
   
   if ((sSrcName == NULL)  || (sDstName == NULL) || (strlen(sSrcName) < 1) || (strlen(sDstName) < 1)) {
-    printf("(EE) VFSCopyOut: The value of 'sSrcName' or 'sDstName' is NULL or empty\n");
+    printf("(EE) VFSCopyToLocal: The value of 'sSrcName' or 'sDstName' is NULL or empty\n");
     return cVFS_Failed;
   }
   
-  printf("(II) VFSCopyOut: copying file '%s' out to '%s'\n", sSrcName, sDstName);
+  printf("(II) VFSCopyToLocal: copying file '%s' out to '%s'\n", sSrcName, sDstName);
 
   unsigned long int file_no = filelist_find_index_by_path(globs->files, sSrcName) - 1;
   if (file_no < 0) {
-    printf("(EE) VFSCopyOut: can't find source file '%s'\n", sSrcName);
+    printf("(EE) VFSCopyToLocal: can't find source file '%s'\n", sSrcName);
     return cVFS_ReadErr;
   }
 
@@ -910,14 +910,14 @@ TVFSResult VFSCopyOut(struct TVFSGlobs *globs, const char *sSrcName, const char
         try_again = FALSE; 
         if (! globs->zip->ExtractFile(file_no, dest_path, false, dest_filename, globs->block_size)) {
           globs->zip->CloseFile(NULL, true);
-          fprintf(stderr, "(EE) VFSCopyOut: Error while copying out, archive closed = %d.\n", globs->zip->IsClosed());
+          fprintf(stderr, "(EE) VFSCopyToLocal: Error while copying out, archive closed = %d.\n", globs->zip->IsClosed());
           return cVFS_WriteErr;
         } 
-        fprintf(stderr, "(II) VFSCopyOut: copy OK, archive closed = %d.\n", globs->zip->IsClosed());
+        fprintf(stderr, "(II) VFSCopyToLocal: copy OK, archive closed = %d.\n", globs->zip->IsClosed());
       }
       catch (CZipException e) {
         globs->zip->CloseFile(NULL, true);
-        fprintf(stderr, "(EE) VFSCopyOut: Error while copying out: [%d] %s, archive closed = %d.\n", 
+        fprintf(stderr, "(EE) VFSCopyToLocal: Error while copying out: [%d] %s, archive closed = %d.\n", 
                             e.m_iCause, (LPCTSTR)e.GetErrorDescription(), globs->zip->IsClosed());
         switch (e.m_iCause) {
           case CZipException::badPassword:
@@ -928,7 +928,7 @@ TVFSResult VFSCopyOut(struct TVFSGlobs *globs, const char *sSrcName, const char
                                                       NULL, &passwd, NULL, NULL, NULL,
                                                       globs->callback_data);
               if (res && passwd) {
-                fprintf(stderr, "  (II) VFSCopyOut: setting password to '%s'\n", passwd);
+                fprintf(stderr, "  (II) VFSCopyToLocal: setting password to '%s'\n", passwd);
                 globs->zip->SetPassword(passwd);
                 try_again = TRUE;
                 break;
@@ -943,7 +943,7 @@ TVFSResult VFSCopyOut(struct TVFSGlobs *globs, const char *sSrcName, const char
   }
   catch (...)
   {
-    fprintf(stderr, "(EE) VFSCopyOut: Fatal error while copying out..., archive closed = %d.\n", globs->zip->IsClosed());
+    fprintf(stderr, "(EE) VFSCopyToLocal: Fatal error while copying out..., archive closed = %d.\n", globs->zip->IsClosed());
     return cVFS_WriteErr;
   }  
 
@@ -954,16 +954,16 @@ TVFSResult VFSCopyOut(struct TVFSGlobs *globs, const char *sSrcName, const char
 
 //  Known issues: - archive corruption when no space left on device
 //				  - encrypted files are unreadable after copy in
-TVFSResult VFSCopyIn(struct TVFSGlobs *globs, const char *sSrcName, const char *sDstName, int Append)
+TVFSResult VFSCopyFromLocal(struct TVFSGlobs *globs, const char *sSrcName, const char *sDstName, int Append)
 {
   gboolean try_again;
 
   if ((sSrcName == NULL)  || (sDstName == NULL) || (strlen(sSrcName) < 1) || (strlen(sDstName) < 1)) {
-    printf("(EE) VFSCopyIn: The value of 'sSrcName' or 'sDstName' is NULL or empty\n");
+    printf("(EE) VFSCopyFromLocal: The value of 'sSrcName' or 'sDstName' is NULL or empty\n");
     return cVFS_Failed;
   }
 
-  printf("(II) VFSCopyIn: copying file '%s' in to '%s'\n", sSrcName, sDstName);
+  printf("(II) VFSCopyFromLocal: copying file '%s' in to '%s'\n", sSrcName, sDstName);
 
   try {
     do {
@@ -974,12 +974,12 @@ TVFSResult VFSCopyIn(struct TVFSGlobs *globs, const char *sSrcName, const char *
           globs->zip->CloseNewFile(true);
           globs->zip->CloseFile(NULL, true);
           build_global_filelist(globs);
-          fprintf(stderr, "(EE) VFSCopyIn: Error while copying in, archive closed = %d.\n", globs->zip->IsClosed());
+          fprintf(stderr, "(EE) VFSCopyFromLocal: Error while copying in, archive closed = %d.\n", globs->zip->IsClosed());
           return cVFS_WriteErr;
         }
 
         globs->zip->Flush();
-        printf("(II) VFSCopyIn: copy OK, archive closed = %d.\n", globs->zip->IsClosed());
+        printf("(II) VFSCopyFromLocal: copy OK, archive closed = %d.\n", globs->zip->IsClosed());
         build_global_filelist(globs);
         globs->archive_modified = true;
 
@@ -988,12 +988,12 @@ TVFSResult VFSCopyIn(struct TVFSGlobs *globs, const char *sSrcName, const char *
         if (globs->need_password) {
             unsigned long int file_no = filelist_find_index_by_path(globs->files, s) - 1;
             if (file_no < 0) {
-                    printf("(EE) VFSCopyIn: unable to find index for newly written file '%s'\n", sSrcName);
+                    printf("(EE) VFSCopyFromLocal: unable to find index for newly written file '%s'\n", sSrcName);
                     return cVFS_WriteErr;
             }
-            printf("(II) VFSCopyIn: Encrypting the newly written file...\n");
+            printf("(II) VFSCopyFromLocal: Encrypting the newly written file...\n");
             if (! globs->zip->EncryptFile(file_no)) 
-                    printf("(EE) VFSCopyIn: Unable to encrypt the newly written file\n");
+                    printf("(EE) VFSCopyFromLocal: Unable to encrypt the newly written file\n");
         }  
     */
         
@@ -1003,7 +1003,7 @@ TVFSResult VFSCopyIn(struct TVFSGlobs *globs, const char *sSrcName, const char *
         globs->zip->CloseNewFile(true);
         globs->zip->CloseFile(NULL, true);
         build_global_filelist(globs);
-        fprintf(stderr, "(EE) VFSCopyIn: Error while copying in: [%d] %s, archive closed = %d.\n", 
+        fprintf(stderr, "(EE) VFSCopyFromLocal: Error while copying in: [%d] %s, archive closed = %d.\n", 
                         e.m_iCause, (LPCTSTR)e.GetErrorDescription(), globs->zip->IsClosed());
         switch (e.m_iCause) {
           case CZipException::badPassword:
@@ -1014,7 +1014,7 @@ TVFSResult VFSCopyIn(struct TVFSGlobs *globs, const char *sSrcName, const char *
                                                       NULL, &passwd, NULL, NULL, NULL,
                                                       globs->callback_data);
               if (res && passwd) {
-                fprintf(stderr, "  (II) VFSCopyIn: setting password to '%s'\n", passwd);
+                fprintf(stderr, "  (II) VFSCopyFromLocal: setting password to '%s'\n", passwd);
                 globs->zip->SetPassword(passwd);
                 try_again = TRUE;
                 break;
@@ -1029,7 +1029,7 @@ TVFSResult VFSCopyIn(struct TVFSGlobs *globs, const char *sSrcName, const char *
   }
   catch (...)
   {
-    fprintf(stderr, "(EE) VFSCopyIn: Fatal error while copying in..., archive closed = %d.\n", globs->zip->IsClosed());
+    fprintf(stderr, "(EE) VFSCopyFromLocal: Fatal error while copying in..., archive closed = %d.\n", globs->zip->IsClosed());
     return cVFS_WriteErr;
   }