Changeset 904 in MondoRescue for trunk/mindi-busybox/archival

Timestamp:

Oct 25, 2006, 1:51:57 AM (17 years ago)

Author:

Bruno Cornec

Message:

merge -r890:902 $SVN_M/branches/stable

Location:

trunk/mindi-busybox/archival

Files:

• Makefile.in (modified) (1 diff)
• libunarchive/decompress_uncompress.c (modified) (5 diffs)
• libunarchive/find_list_entry.c (modified) (1 diff)

trunk/mindi-busybox/archival/Makefile.in

@@ -12 +12 @@
 
 ARCHIVAL-y:=
-ARCHIVAL-$(CONFIG_APT_GET)  +=
 ARCHIVAL-$(CONFIG_AR)       += ar.o
 ARCHIVAL-$(CONFIG_BUNZIP2)  += bunzip2.o

trunk/mindi-busybox/archival/libunarchive/decompress_uncompress.c

@@ -70 +70 @@
 static int maxbits = BITS;
 
-/* Input buffer */
-static unsigned char inbuf[IBUFSIZ + 64];
-
-/* Output buffer */
-static unsigned char outbuf[OBUFSIZ + 2048];
-
-
-static unsigned char htab[HSIZE];
-static unsigned short codetab[HSIZE];
-
 #define htabof(i)               htab[i]
 #define codetabof(i)            codetab[i]
@@ -85 +75 @@
 #define tab_suffixof(i)         ((unsigned char *)(htab))[i]
 #define de_stack                ((unsigned char *)&(htab[HSIZE-1]))
-#define clear_htab()            memset(htab, -1, sizeof(htab))
+#define clear_htab()            memset(htab, -1, HSIZE)
 #define clear_tab_prefixof()    memset(codetab, 0, 256);
 
@@ -113 +103 @@
     int n_bits;
     int rsize = 0;
+    RESERVE_CONFIG_UBUFFER(inbuf, IBUFSIZ + 64);
+    RESERVE_CONFIG_UBUFFER(outbuf, OBUFSIZ + 2048);
+    unsigned char htab[HSIZE];
+    unsigned short codetab[HSIZE];
+    memset(inbuf, 0, IBUFSIZ + 64);
+    memset(outbuf, 0, OBUFSIZ + 2048);
 
     insize = 0;
@@ -160 +156 @@
         }
 
-        if (insize < (int) sizeof(inbuf) - IBUFSIZ) {
+        if (insize < (int) (IBUFSIZ + 64) - IBUFSIZ) {
             rsize = safe_read(fd_in, inbuf + insize, IBUFSIZ);
             insize += rsize;
@@ -286 +282 @@
     }
 
+    RELEASE_CONFIG_BUFFER(inbuf);
+    RELEASE_CONFIG_BUFFER(outbuf);
     return 0;
 }

trunk/mindi-busybox/archival/libunarchive/find_list_entry.c

@@ -14 +14 @@
 {
     while (list) {
-        if (fnmatch(list->data, filename, 0) == 0) {
+        if (fnmatch(list->data, filename, FNM_LEADING_DIR) == 0) {
             return (list);
         }