summaryrefslogtreecommitdiff
path: root/unrar/unrar.c
diff options
context:
space:
mode:
authorTomas Bzatek <tbzatek@users.sourceforge.net>2008-11-15 16:21:23 +0100
committerTomas Bzatek <tbzatek@users.sourceforge.net>2008-11-15 16:21:23 +0100
commit1c50d6836601b8a6258dd6e299b3f299aa8d4a0f (patch)
tree137c71a069d96a5695a2c73f11916b6ef6399fbd /unrar/unrar.c
parent4fd3fefa6db8b77915bc67d4623ef3176a431004 (diff)
downloadtuxcmd-modules-1c50d6836601b8a6258dd6e299b3f299aa8d4a0f.tar.xz
Packed size info supportv0.6.59
Diffstat (limited to 'unrar/unrar.c')
-rw-r--r--unrar/unrar.c17
1 files changed, 9 insertions, 8 deletions
diff --git a/unrar/unrar.c b/unrar/unrar.c
index 47e3cb3..b35f37e 100644
--- a/unrar/unrar.c
+++ b/unrar/unrar.c
@@ -1,5 +1,5 @@
/* UNRAR plugin for Tux Commander
- * version 0.3.3, designed for unrar v3.8.2
+ * version 0.3.4, designed for unrar v3.8.2
* Copyright (C) 2008 Tomas Bzatek <tbzatek@users.sourceforge.net>
* Check for updates on tuxcmd.sourceforge.net
*
@@ -55,8 +55,8 @@ enum HOST_SYSTEM {
};
-#define VERSION "0.3.3"
-#define BUILD_DATE "2008-11-14"
+#define VERSION "0.3.4"
+#define BUILD_DATE "2008-11-15"
#define DEFAULT_BLOCK_SIZE 65536
@@ -80,10 +80,10 @@ struct TVFSGlobs {
struct PathTree *files;
struct VfsFilelistData *vfs_filelist;
- u_int64_t total_size;
+ int64_t total_size;
- u_int64_t extract_file_size;
- u_int64_t extract_done;
+ int64_t extract_file_size;
+ int64_t extract_done;
gboolean extract_cancelled;
TVFSAskQuestionCallback callback_ask_question;
@@ -370,7 +370,8 @@ TVFSResult VFSOpen(struct TVFSGlobs *globs, char *sName)
struct TVFSItem *item = (struct TVFSItem*)malloc(sizeof(struct TVFSItem));
memset(item, 0, sizeof(struct TVFSItem));
- item->iSize = (u_int64_t)((u_int64_t)(header->UnpSizeHigh * 0x100000000) + (u_int64_t)header->UnpSize);
+ item->iSize = (int64_t)((int64_t)(header->UnpSizeHigh * 0x100000000) + (int64_t)header->UnpSize);
+ item->iPackedSize = (int64_t)((int64_t)(header->PackSizeHigh * 0x100000000) + (int64_t)header->PackSize);
globs->total_size += item->iSize;
if ((header->Flags & 0x00e0 /* LHD_WINDOWMASK */ ) == 0x00e0 /* LHD_DIRECTORY */)
item->ItemType = vDirectory;
@@ -710,7 +711,7 @@ TVFSResult VFSCopyOut(struct TVFSGlobs *globs, const char *sSrcName, const char
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));
globs->extract_done = 0;
- globs->extract_file_size = (u_int64_t)((u_int64_t)(header->UnpSizeHigh * 0x100000000) + (u_int64_t)header->UnpSize);
+ globs->extract_file_size = (int64_t)((int64_t)(header->UnpSizeHigh * 0x100000000) + (int64_t)header->UnpSize);
globs->extract_cancelled = FALSE;
int res2 = RARProcessFile(handle, RAR_EXTRACT, NULL, (char *)sDstName);