X-Git-Url: http://gitweb/?a=blobdiff_plain;f=pkgutil.cc;h=00cedafab26c95ed795e96af8c4fd6d17196cc92;hb=c9984aa86ec99c6dd8d47c2bf3d7a409a1c4fa48;hp=b4d419bde9a3d04ddf99be010a9c106aeac6d648;hpb=25efd91b9eec7755e4296591f531c923209dd1fa;p=pkgutils-cross.git

diff --git a/pkgutil.cc b/pkgutil.cc
index b4d419b..00cedaf 100644
--- a/pkgutil.cc
+++ b/pkgutil.cc
@@ -38,11 +38,14 @@
 #include <sys/param.h>
 #include <unistd.h>
 #include <fcntl.h>
-#include <zlib.h>
 #include <libgen.h>
 #include <archive.h>
 #include <archive_entry.h>
 
+#define INIT_ARCHIVE(ar) \
+	archive_read_support_compression_all((ar)); \
+	archive_read_support_format_all((ar))
+
 using __gnu_cxx::stdio_filebuf;
 
 pkgutil::pkgutil(const string& name)
@@ -343,8 +346,7 @@ pair<string, pkgutil::pkginfo_t> pkgutil::pkg_open(const string& filename) const
 	result.second.version = version;
 
 	archive = archive_read_new();
-	archive_read_support_compression_all(archive);
-	archive_read_support_format_all(archive);
+	INIT_ARCHIVE(archive);
 
 	if (archive_read_open_filename(archive,
 	    const_cast<char*>(filename.c_str()),
@@ -383,8 +385,7 @@ void pkgutil::pkg_install(const string& filename, const set<string>& keep_list,
 	unsigned int i;
 
 	archive = archive_read_new();
-	archive_read_support_compression_all(archive);
-	archive_read_support_format_all(archive);
+	INIT_ARCHIVE(archive);
 
 	if (archive_read_open_filename(archive,
 	    const_cast<char*>(filename.c_str()),
@@ -422,8 +423,9 @@ void pkgutil::pkg_install(const string& filename, const set<string>& keep_list,
 		                           (real_filename.c_str()));
 
 		// Extract file
-		if (archive_read_extract(archive, entry, ARCHIVE_EXTRACT_OWNER && ARCHIVE_EXTRACT_PERM) !=
-		    ARCHIVE_OK) {
+		unsigned int flags = ARCHIVE_EXTRACT_OWNER | ARCHIVE_EXTRACT_PERM | ARCHIVE_EXTRACT_UNLINK;
+
+		if (archive_read_extract(archive, entry, flags) != ARCHIVE_OK) {
 			// If a file fails to install we just print an error message and
 			// continue trying to install the rest of the package.
 			const char* msg = archive_error_string(archive);
@@ -498,8 +500,7 @@ void pkgutil::pkg_footprint(string& filename) const
 	//
 	// FIXME the code duplication here is butt ugly
 	archive = archive_read_new();
-	archive_read_support_compression_all(archive);
-	archive_read_support_format_all(archive);
+	INIT_ARCHIVE(archive);
 
 	if (archive_read_open_filename(archive,
 	    const_cast<char*>(filename.c_str()),
@@ -526,8 +527,7 @@ void pkgutil::pkg_footprint(string& filename) const
 	// Too bad, there doesn't seem to be a way to reuse our archive
 	// instance
 	archive = archive_read_new();
-	archive_read_support_compression_all(archive);
-	archive_read_support_format_all(archive);
+	INIT_ARCHIVE(archive);
 
 	if (archive_read_open_filename(archive,
 	    const_cast<char*>(filename.c_str()),
@@ -698,42 +698,6 @@ string mtos(mode_t mode)
 	return s;
 }
 
-int unistd_gzopen(char* pathname, int flags, mode_t mode)
-{
-	char* gz_mode;
-   
-	switch (flags & O_ACCMODE) {
-	case O_WRONLY:
-		gz_mode = "w";
-		break;
-
-	case O_RDONLY:
-		gz_mode = "r";
-		break;
-
-	case O_RDWR:
-	default:
-		errno = EINVAL;
-		return -1;
-	}
-
-	int fd;
-	gzFile gz_file;
-
-	if ((fd = open(pathname, flags, mode)) == -1)
-		return -1;
-   
-	if ((flags & O_CREAT) && fchmod(fd, mode))
-		return -1;
-   
-	if (!(gz_file = gzdopen(fd, gz_mode))) {
-		errno = ENOMEM;
-		return -1;
-	}
-   
-	return (int)gz_file;
-}
-
 string trim_filename(const string& filename)
 {
 	string search("//");