Implement suggestion from Adam Slattery, (don't default to killing closing bug #1190.

[oweals/busybox.git] / dpkg.c

diff --git a/dpkg.c b/dpkg.c
index e5ed95cb86c1ce1d18e87bdfbf53819f8156f8e8..01ddc7b7b77a867aa9de1d6cef97e161e4a935e2 100644 (file)
--- a/dpkg.c
+++ b/dpkg.c
@@ -13,7 +13,6 @@
 
 #include "busybox.h"
 
-
 #define DEPENDSMAX     64      /* maximum number of depends we can handle */
 
 /* Should we do full dependency checking? */
@@ -116,37 +115,6 @@ static int package_compare(const void *p1, const void *p2)
                ((package_t *)p2)->package);
 }
 
-/*
- * NOTE: this was handled by a "rm -rf" shell command
- * Maybe theis behaviour should be integrated into the rm applet
- * (i dont appreciate the rm applets recursive action fn)-bug1
- */
-static int remove_dir(const char *dirname)
-{
-       struct dirent *fp;
-       DIR *dp = opendir(dirname);
-       while ((fp = readdir(dp)) != NULL) {
-               struct stat statbuf;
-               char *filename;
-
-               filename = (char *) xcalloc(1, strlen(dirname) + strlen(fp->d_name) + 2);
-               strcpy(filename, dirname);
-               strcat(filename, fp->d_name);
-               lstat(filename, &statbuf);
-
-               if ((strcmp(fp->d_name, ".") != 0) && (strcmp(fp->d_name, "..") != 0)) {
-                       if (S_ISDIR(statbuf.st_mode)) {
-                               remove_dir(strcat(filename, "/"));
-                       }
-                       else if (remove(filename) == -1) {
-                               perror_msg(filename);
-                       }
-               }
-       }
-       remove(dirname);
-       return EXIT_SUCCESS;
-}
-
 #ifdef DODEPENDS
 #include <ctype.h>
 
@@ -518,7 +486,7 @@ static void *status_read(void)
                return(NULL);
        }
 
-       while ( (package_control_buffer = read_text_file_to_buffer(f)) != NULL) {
+       while ( (package_control_buffer = fgets_str(f, "\n\n")) != NULL) {
                m = (package_t *)xcalloc(1, sizeof(package_t));
                fill_package_struct(m, package_control_buffer);
                if (m->package) {
@@ -583,7 +551,7 @@ static int status_merge(void *status, package_t *pkgs)
         */
        if ((fin = fopen(statusfile, "r")) != NULL) {
                while (((line = get_line_from_file(fin)) != NULL) && !feof(fin)) { 
-                       line[strlen(line) - 1] = '\0'; /* trim newline */
+                       chomp(line); /* trim newline */
                        /* If we see a package header, find out if it's a package
                         * that we have processed. if so, we skip that block for
                         * now (write it at the end).
@@ -681,24 +649,26 @@ static int dpkg_doconfigure(package_t *pkg)
 
 static int dpkg_dounpack(package_t *pkg)
 {
-       int r = 0;
+       FILE *out_stream;
+       char *info_prefix;
        int status = TRUE;
-       char *lst_path;
+       int r = 0;
 
        DPRINTF("Unpacking %s\n", pkg->package);
 
        /* extract the data file */
-       deb_extract(pkg->filename, extract_extract, "/", NULL);
+       deb_extract(pkg->filename, stdout, (extract_data_tar_gz | extract_all_to_fs), "/", NULL);
 
        /* extract the control files */
-       deb_extract(pkg->filename, extract_control, infodir, pkg->package);
+       info_prefix = (char *) malloc(strlen(pkg->package) + strlen(infodir) + 2 + 5 + 1);
+       sprintf(info_prefix, "%s/%s.", infodir, pkg->package);
+       deb_extract(pkg->package, stdout, (extract_control_tar_gz | extract_all_to_fs), info_prefix, NULL);
 
        /* Create the list file */
-       lst_path = xmalloc(strlen(infodir) + strlen(pkg->package) + 6);
-       strcpy(lst_path, infodir);
-       strcat(lst_path, pkg->package);
-       strcat(lst_path, ".list");
-       deb_extract(pkg->filename, extract_contents_to_file, lst_path, NULL);
+       strcat(info_prefix, "list");
+       out_stream = wfopen(info_prefix, "w");                  
+       deb_extract(pkg->package, out_stream, (extract_data_tar_gz | extract_list), NULL, NULL);
+       fclose(out_stream);
 
        pkg->state_want = state_want_install;
        pkg->state_flag = state_flag_ok;
@@ -723,7 +693,7 @@ static int dpkg_read_control(package_t *pkg)
        if ((pkg_file = wfopen(pkg->filename, "r")) == NULL) {
                return EXIT_FAILURE;
        }
-       control_buffer = deb_extract(pkg->filename, extract_field, NULL, NULL);
+       control_buffer = deb_extract(pkg->filename, stdout, (extract_control_tar_gz | extract_one_to_buffer), NULL, "./control");
        fill_package_struct(pkg, control_buffer);
        return EXIT_SUCCESS;
 }
@@ -835,7 +805,7 @@ extern int dpkg_main(int argc, char **argv)
 
        package_t *p, *packages = NULL;
        void *status = NULL;
-       char opt = 0;
+       int opt = 0;
        int optflag = 0;
 
        while ((opt = getopt(argc, argv, "iruc")) != -1) {
@@ -867,7 +837,7 @@ extern int dpkg_main(int argc, char **argv)
                optind++;
        }
 
-       create_path(infodir, S_IRWXU);
+       make_directory((char *)infodir, S_IRWXU, FILEUTILS_RECUR);
 
        status = status_read();