Update dpkg to use new unarchive code

3 files changed, 36 insertions, 0 deletions

diff --git a/archival/libunarchive/Makefile.in b/archival/libunarchive/Makefile.in
index e559cb40e..87c888b0b 100644
--- a/archival/libunarchive/Makefile.in
+++ b/archival/libunarchive/Makefile.in
@@ -26,7 +26,9 @@ LIBUNARCHIVE-y:= \
 \
         data_skip.o \
         data_extract_all.o \
+        data_extract_all_prefix.o \
         data_extract_to_stdout.o \
+        data_extract_to_buffer.o \
 \
         filter_accept_all.o \
         filter_accept_list.o \
diff --git a/archival/libunarchive/data_extract_all_prefix.c b/archival/libunarchive/data_extract_all_prefix.c
new file mode 100644
index 000000000..e4e93fc74
--- /dev/null
+++ b/archival/libunarchive/data_extract_all_prefix.c
@@ -0,0 +1,23 @@
+#include <sys/types.h>
+#include <errno.h>
+#include <fcntl.h>
+#include <stdlib.h>
+#include <string.h>
+#include <utime.h>
+#include <unistd.h>
+#include <stdlib.h>
+#include "libbb.h"
+#include "unarchive.h"
+
+extern void data_extract_all_prefix(archive_handle_t *archive_handle)
+{
+        char *name_ptr = archive_handle->file_header->name;
+
+        name_ptr += strspn(name_ptr, "./");
+        if (name_ptr[0] != '\0') {
+                archive_handle->file_header->name = xmalloc(strlen(archive_handle->buffer) + 2 + strlen(name_ptr));
+                sprintf(archive_handle->file_header->name, "%s%s", archive_handle->buffer, name_ptr);
+                data_extract_all(archive_handle);
+        }
+        return;
+}
diff --git a/archival/libunarchive/data_extract_to_buffer.c b/archival/libunarchive/data_extract_to_buffer.c
new file mode 100644
index 000000000..02ee4b362
--- /dev/null
+++ b/archival/libunarchive/data_extract_to_buffer.c
@@ -0,0 +1,11 @@
+#include <stdlib.h>
+#include <stdio.h>
+#include "unarchive.h"
+#include "libbb.h"
+
+extern void data_extract_to_buffer(archive_handle_t *archive_handle)
+{
+        archive_handle->buffer = xmalloc(archive_handle->file_header->size + 1);
+        
+        xread_all(archive_handle->src_fd, archive_handle->buffer, archive_handle->file_header->size);
+}