summaryrefslogtreecommitdiff
path: root/libarchive
diff options
context:
space:
mode:
authorTomas Bzatek <tbzatek@users.sourceforge.net>2009-10-24 17:11:22 +0200
committerTomas Bzatek <tbzatek@users.sourceforge.net>2009-10-24 17:11:22 +0200
commitc082fe2979d033f70152922da49fb6be17c594bf (patch)
tree03e4c7c79392fbc2f1a7a8bac3b80cc87e36a9ba /libarchive
parentdb2ce1f3eb443926d496640fe1f8f1f42af431b0 (diff)
downloadtuxcmd-modules-c082fe2979d033f70152922da49fb6be17c594bf.tar.xz
Rename VFSCopyOut and VFSCopyIn functions
Diffstat (limited to 'libarchive')
-rw-r--r--libarchive/libarchive.c24
1 files changed, 12 insertions, 12 deletions
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;
}