summaryrefslogtreecommitdiff
path: root/libarchive
diff options
context:
space:
mode:
authorTomas Bzatek <tbzatek@users.sourceforge.net>2008-11-16 18:39:47 +0100
committerTomas Bzatek <tbzatek@users.sourceforge.net>2008-11-16 18:39:47 +0100
commitf6b4abc7cacf512e4f8514203c98c090125c0338 (patch)
tree170e5434a34d7b9de08f3a9863b4f2a28003ffd9 /libarchive
parentf1ef4efb60e341a2a8ec72560071656b9d8b927d (diff)
downloadtuxcmd-modules-f6b4abc7cacf512e4f8514203c98c090125c0338.tar.xz
Prevent displaying './' items
Diffstat (limited to 'libarchive')
-rw-r--r--libarchive/libarchive.c16
1 files changed, 1 insertions, 15 deletions
diff --git a/libarchive/libarchive.c b/libarchive/libarchive.c
index 00f49a1..61d0071 100644
--- a/libarchive/libarchive.c
+++ b/libarchive/libarchive.c
@@ -260,18 +260,6 @@ TVFSResult VFSOpen(struct TVFSGlobs *globs, char *sName)
item->c_time = archive_entry_ctime(entry);
item->a_time = archive_entry_atime(entry);
-#if 0
- char *s;
- if (! archive_entry_pathname_w(entry)) {
- if (g_utf8_validate (archive_entry_pathname(entry), -1, NULL))
- s = g_strdup (archive_entry_pathname(entry));
- else
- s = g_filename_display_name (archive_entry_pathname(entry));
- }
- else
- s = wide_to_utf8 (archive_entry_pathname_w(entry));
-#endif
-
char *s;
if (g_utf8_validate (archive_entry_pathname(entry), -1, NULL))
s = g_strdup (archive_entry_pathname(entry));
@@ -281,8 +269,6 @@ TVFSResult VFSOpen(struct TVFSGlobs *globs, char *sName)
else
s = g_filename_display_name (archive_entry_pathname(entry));
}
-
-
// g_print("file = '%s', wide = '%ls'\n", archive_entry_pathname(entry), archive_entry_pathname_w(entry));
// Add item to the global list and continue with next file
@@ -567,7 +553,7 @@ my_archive_read_data_into_fd(struct TVFSGlobs *globs, struct archive *a, struct
p += bytes_written;
size -= bytes_written;
- log(" (II) my_archive_read_data_into_fd: bytes_written = %u, total_written = %u\n", bytes_written, total_written);
+ log(" (II) my_archive_read_data_into_fd: bytes_written = %zd, total_written = %zd\n", bytes_written, total_written);
if (globs->callback_progress) {
if (! globs->callback_progress(total_written, file_size, globs->callback_data)) {
cancel = TRUE;