Bug #221: pkgmk optionally now only warns about new files in a footprint.

[pkgutils-cross.git] / pkgutil.cc

diff --git a/pkgutil.cc b/pkgutil.cc
index b4d419bde9a3d04ddf99be010a9c106aeac6d648..05b7a1a80e02c69bc7698a36542dfb4068f52893 100644 (file)
--- a/pkgutil.cc
+++ b/pkgutil.cc
@@ -2,6 +2,7 @@
 //  pkgutils
 // 
 //  Copyright (c) 2000-2005 Per Liden
+//  Copyright (c) 2006-2007 by CRUX team (http://crux.nu)
 // 
 //  This program is free software; you can redistribute it and/or modify
 //  it under the terms of the GNU General Public License as published by
@@ -38,11 +39,16 @@
 #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_gzip((ar)); \
+       archive_read_support_compression_bzip2((ar)); \
+       archive_read_support_compression_xz((ar)); \
+       archive_read_support_format_tar((ar))
+
 using __gnu_cxx::stdio_filebuf;
 
 pkgutil::pkgutil(const string& name)
@@ -343,8 +349,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()),
@@ -381,10 +386,11 @@ void pkgutil::pkg_install(const string& filename, const set<string>& keep_list,
        struct archive* archive;
        struct archive_entry* entry;
        unsigned int i;
+       char buf[PATH_MAX];
+       string absroot;
 
        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()),
@@ -392,12 +398,13 @@ void pkgutil::pkg_install(const string& filename, const set<string>& keep_list,
                throw runtime_error_with_errno("could not open " + filename, archive_errno(archive));
 
        chdir(root.c_str());
+       absroot = getcwd(buf, sizeof(buf));
 
        for (i = 0; archive_read_next_header(archive, &entry) ==
             ARCHIVE_OK; ++i) {
                string archive_filename = archive_entry_pathname(entry);
-               string reject_dir = trim_filename(root + string("/") + string(PKG_REJECTED));
-               string original_filename = trim_filename(root + string("/") + archive_filename);
+               string reject_dir = trim_filename(absroot + string("/") + string(PKG_REJECTED));
+               string original_filename = trim_filename(absroot + string("/") + archive_filename);
                string real_filename = original_filename;
 
                // Check if file is filtered out via INSTALL
@@ -422,8 +429,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_TIME | 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 +506,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 +533,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 +704,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("//");