summaryrefslogtreecommitdiff
path: root/libarchive
diff options
context:
space:
mode:
authorTomas Bzatek <tbzatek@users.sourceforge.net>2009-10-25 18:10:51 +0100
committerTomas Bzatek <tbzatek@users.sourceforge.net>2009-10-25 18:10:51 +0100
commit407ffece7951dd089cc8f18c33312f7757739c3d (patch)
treea82a80765724f44055742d4fe63b9b82d5aa4cde /libarchive
parent72bdb9394347572644799ad964d1fbc6f3969033 (diff)
downloadtuxcmd-modules-407ffece7951dd089cc8f18c33312f7757739c3d.tar.xz
Separate archiving and networking mode
Diffstat (limited to 'libarchive')
-rw-r--r--libarchive/libarchive.c16
1 files changed, 8 insertions, 8 deletions
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);