@@ -1,3 +1,14 @@

+Wed Oct 18 09:48:46 BST 2006 (trog)

+-----------------------------------

+  * libclamav/unrar/unrar.c,unrar.h,unrar20.c,unrarfilter.c,unrarppm.c,unrarvm.c:

+		- Add O_BINARY support

+		- Clean up includes

+		- Extract per-file comments

+

+Tue Oct 17 14:11:32 BST 2006 (trog)

+-----------------------------------

+  * libclamav/unrar/unrar.c, unrar.h: extract main archive comment for scan

+

 Mon Oct 16 10:53:09 CEST 2006 (tk)

 ----------------------------------

   * 0.90RC1.1

@@ -46,6 +46,10 @@

 #include "others.h"

 #include "cltypes.h"

+#ifndef O_BINARY

+#define O_BINARY        0

+#endif

+

 #define int64to32(x) ((unsigned int)(x))

 #define rar_endian_convert_16(v)	le16_to_host(v)

 #define rar_endian_convert_32(v)	le32_to_host(v)

@@ -320,6 +324,7 @@ static file_header_t *read_block(int fd, header_type hdr_type)

 			return NULL;

 		}

 		rar_dbgmsg(" head_size=%u\n", file_header->head_size);

+		file_header->start_offset = offset;

 		file_header->next_offset = offset + file_header->head_size;

 		if (file_header->flags & LONG_BLOCK) {

 			file_header->next_offset += file_header->pack_size;

@@ -359,12 +364,7 @@ static file_header_t *read_block(int fd, header_type hdr_type)

 	}

 	file_header->filename[file_header->name_size] = '\0';

 	cli_dbgmsg("Filename: %s\n", file_header->filename);

-	/* Move to the end of the header */

-	if (lseek(fd, offset+file_header->head_size, SEEK_SET) != offset+file_header->head_size) {

-		cli_dbgmsg("Seek failed: %ld\n", offset+file_header->head_size);

-		return NULL;

-	}

-	

+

 	return file_header;

 }

@@ -1446,7 +1446,7 @@ rar_metadata_t *cli_unrar(int fd, const char *dirname, const struct cl_limits *l

 			cli_dbgmsg("UnPack Version: 0x%.2x\n", comment_header->unpack_ver);

 			cli_dbgmsg("Pack Method: 0x%.2x\n", comment_header->method);

 			snprintf(filename, 1024, "%s/main.cmt", dirname);

-			ofd = open(filename, O_WRONLY|O_CREAT|O_TRUNC, 0600);

+			ofd = open(filename, O_WRONLY|O_CREAT|O_TRUNC|O_BINARY, 0600);

 			if (ofd < 0) {

 				free(comment_header);

 				cli_dbgmsg("ERROR: Failed to open output file\n");

@@ -1513,13 +1513,49 @@ rar_metadata_t *cli_unrar(int fd, const char *dirname, const struct cl_limits *l

 				break;

 			}

 		}

+		if (file_header->flags & LHD_COMMENT) {

+			comment_header_t *comment_header;

+

+			cli_dbgmsg("File comment present\n");

+			comment_header = read_header(fd, COMM_HEAD);

+			if (comment_header) {

+				cli_dbgmsg("Comment type: 0x%.2x\n", comment_header->head_type);

+				cli_dbgmsg("Head size: 0x%.4x\n", comment_header->head_size);

+				cli_dbgmsg("UnPack Size: 0x%.4x\n", comment_header->unpack_size);

+				cli_dbgmsg("UnPack Version: 0x%.2x\n", comment_header->unpack_ver);

+				cli_dbgmsg("Pack Method: 0x%.2x\n", comment_header->method);

+				if ((comment_header->unpack_ver < 15) || (comment_header->unpack_ver > 29) ||

+						(comment_header->method > 0x30)) {

+					cli_dbgmsg("Can't process file comment - skipping\n");

+				} else {

+					snprintf(filename, 1024, "%s/%lu.cmt", dirname, file_count);

+					ofd = open(filename, O_WRONLY|O_CREAT|O_TRUNC|O_BINARY, 0600);

+					if (ofd < 0) {

+						free(comment_header);

+						cli_dbgmsg("ERROR: Failed to open output file\n");

+					} else {

+                	                        cli_dbgmsg("Copying file comment (not packed)\n");

+                        	                copy_file_data(fd, ofd, comment_header->unpack_size);

+						close(ofd);

+					}

+				}

+				free(comment_header);

+			}

+		}

+	        if (lseek(fd, file_header->start_offset+file_header->head_size, SEEK_SET) !=

+							file_header->start_offset+file_header->head_size) {

+        	        cli_dbgmsg("Seek failed: %ld\n", offset+file_header->head_size);

+			free(file_header->filename);

+			free(file_header);

+			break;

+        	}

 		if (file_header->flags & LHD_PASSWORD) {

 			cli_dbgmsg("PASSWORDed file: %s\n", file_header->filename);

 			metadata_tail->encrypted = TRUE;

 		} else /*if (file_header->unpack_size)*/ {

 			snprintf(filename, 1024, "%s/%lu.ura", dirname, file_count);

-			ofd = open(filename, O_WRONLY|O_CREAT|O_TRUNC, 0600);

+			ofd = open(filename, O_WRONLY|O_CREAT|O_TRUNC|O_BINARY, 0600);

 			if (ofd < 0) {

 				free(file_header->filename);

 				free(file_header);

@@ -29,7 +29,6 @@

 #include <unistd.h>

 #endif

-/*	#define RAR_DEBUG */

 /*	#define RAR_HIGH_DEBUG */

 struct unpack_data_tag;

@@ -144,6 +143,7 @@ typedef struct file_header_tag

 	uint16_t name_size __attribute__ ((packed));

 	uint32_t file_attr __attribute__ ((packed));

 	unsigned char *filename __attribute__ ((packed));

+	off_t start_offset __attribute__ ((packed));

 	off_t next_offset __attribute__ ((packed));

 } file_header_t;

@@ -21,15 +21,11 @@

  *  MA 02110-1301, USA.

  */

+#include <string.h>

+

 #include "unrar.h"

 #include "unrar20.h"

-#ifdef RAR_DEBUG

-#define cli_dbgmsg printf

-#else

-static void cli_dbgmsg(){};

-#endif

-

 #ifdef RAR_HIGH_DEBUG

 #define rar_dbgmsg printf

 #else

@@ -47,7 +43,7 @@ void unpack_init_data20(int solid, unpack_data_t *unpack_data)

 	}

 }

-static void copy_string20(unpack_data_t *unpack_data, int length, unsigned int distance)

+static void copy_string20(unpack_data_t *unpack_data, unsigned int length, unsigned int distance)

 {

 	unsigned int dest_ptr;

@@ -309,7 +305,7 @@ int rar_unpack20(int fd, int solid, unpack_data_t *unpack_data)

 		if (unpack_data->in_addr > unpack_data->read_top-30) {

 			if (!unp_read_buf(fd, unpack_data)) {

 				cli_dbgmsg("unp_read_buf 2 failed\n");

-				return FALSE;

+				break;

 			}

 		}

 		if (((unpack_data->wr_ptr - unpack_data->unp_ptr) & MAXWINMASK) < 270 &&

@@ -31,6 +31,7 @@

 #include "unrar.h"

 #include "unrarfilter.h"

+#include "others.h"

 void rar_filter_array_init(rar_filter_array_t *filter_a)

 {

@@ -26,12 +26,7 @@

 #include "unrar.h"

 #include "unrarppm.h"

-

-#ifdef RAR_DEBUG

-#define cli_dbgmsg printf

-#else

-static void cli_dbgmsg(){};

-#endif

+#include "others.h"

 #ifdef RAR_HIGH_DEBUG

 #define rar_dbgmsg printf

@@ -30,12 +30,7 @@

 #include "unrar.h"

 #include "unrarvm.h"

 #include "unrarcmd.h"

-

-#ifdef RAR_DEBUG

-#define cli_dbgmsg printf

-#else

-static void cli_dbgmsg(){};

-#endif

+#include "others.h"

 #ifdef RAR_HIGH_DEBUG

 #define rar_dbgmsg printf