summaryrefslogtreecommitdiff
path: root/zip/zip.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'zip/zip.cpp')
-rw-r--r--zip/zip.cpp40
1 files changed, 20 insertions, 20 deletions
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;
}
generated by cgit v1.2.3 (git 2.46.0) at 2026-01-12 10:43:20 +0000