Updates from both Vladimir and Larry
[oweals/busybox.git] / dpkg.c
diff --git a/dpkg.c b/dpkg.c
index 0d2b2dc3c514264855b26b0fd5835ead8ae389fa..18742e8f63ce1afff6c8a18464879948c3f7f7e0 100644 (file)
--- a/dpkg.c
+++ b/dpkg.c
 #define DEPENDSMAX     64      /* maximum number of depends we can handle */
 
 /* Should we do full dependency checking? */
-#define DODEPENDS 1
+//#define DODEPENDS 0
 
 /* Should we do debugging? */
-#define DODEBUG 0
+//#define DODEBUG 0
 
 #ifdef DODEBUG
 #define SYSTEM(x) do_system(x)
@@ -116,37 +116,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>
 
@@ -341,6 +310,7 @@ static int fill_package_struct(package_t *package, const char *package_buffer)
        char *field = NULL;
        int field_start = 0;
        int field_length = 0;
+
        while ((field = read_package_field(&package_buffer[field_start])) != NULL) {
                field_length = strlen(field);
                field_start += (field_length + 1);
@@ -430,6 +400,78 @@ static int fill_package_struct(package_t *package, const char *package_buffer)
        return EXIT_SUCCESS;
 }
 
+extern void write_package(FILE *out_file, package_t *pkg)
+{
+       if (pkg->package) {
+               fprintf(out_file, "Package: %s\n", pkg->package);
+       }
+       if ((pkg->state_want != 0) || (pkg->state_flag != 0)|| (pkg->state_status != 0)) {
+               fprintf(out_file, "Status: %s %s %s\n", 
+                       state_words_want[pkg->state_want - 1],
+                       state_words_flag[pkg->state_flag - 1],
+                       state_words_status[pkg->state_status - 1]);
+       }
+       if (pkg->depends) {
+               fprintf(out_file, "Depends: %s\n", pkg->depends);
+       }
+       if (pkg->provides) {
+               fprintf(out_file, "Provides: %s\n", pkg->provides);
+       }
+       if (pkg->priority) {
+               fprintf(out_file, "Priority: %s\n", pkg->priority);
+       }
+       if (pkg->section) {
+               fprintf(out_file, "Section: %s\n", pkg->section);
+       }
+       if (pkg->section) {
+               fprintf(out_file, "Installed-Size: %s\n", pkg->installed_size);
+       }
+       if (pkg->maintainer) {
+               fprintf(out_file, "Maintainer: %s\n", pkg->maintainer);
+       }
+       if (pkg->source) {
+               fprintf(out_file, "Source: %s\n", pkg->source);
+       }
+       if (pkg->version) {
+               fprintf(out_file, "Version: %s\n", pkg->version);
+       }
+       if (pkg->pre_depends) {
+               fprintf(out_file, "Pre-depends: %s\n", pkg->pre_depends);
+       }
+       if (pkg->replaces) {
+               fprintf(out_file, "Replaces: %s\n", pkg->replaces);
+       }
+       if (pkg->recommends) {
+               fprintf(out_file, "Recommends: %s\n", pkg->recommends);
+       }
+       if (pkg->suggests) {
+               fprintf(out_file, "Suggests: %s\n", pkg->suggests);
+       }
+       if (pkg->conflicts) {
+               fprintf(out_file, "Conflicts: %s\n", pkg->conflicts);
+       }
+       if (pkg->conffiles) {
+               fprintf(out_file, "Conf-files: %s\n", pkg->conffiles);
+       }
+       if (pkg->architecture) {
+               fprintf(out_file, "Architecture: %s\n", pkg->architecture);
+       }
+       if (pkg->filename) {
+               fprintf(out_file, "Filename: %s\n", pkg->filename);
+       }
+       if (pkg->md5sum) {
+               fprintf(out_file, "MD5sum: %s\n", pkg->md5sum);
+       }
+       if (pkg->installer_menu_item) {
+               fprintf(out_file, "installer-main-menu %d\n", pkg->installer_menu_item);
+       }
+       if (pkg->description) {
+               fprintf(out_file, "Description: %s\n", pkg->description);
+       }
+       fputc('\n', out_file);
+       pkg = pkg->next;
+}
+
 static void *status_read(void)
 {
        FILE *f;
@@ -447,9 +489,7 @@ static void *status_read(void)
 
        while ( (package_control_buffer = read_text_file_to_buffer(f)) != NULL) {
                m = (package_t *)xcalloc(1, sizeof(package_t));
-               printf("read buffer [%s]\n", package_control_buffer);
                fill_package_struct(m, package_control_buffer);
-               printf("package is [%s]\n", m->package);
                if (m->package) {
                        /*
                         * If there is an item in the tree by this name,
@@ -489,7 +529,6 @@ static void *status_read(void)
                        free(m);
                }
        }
-       printf("done\n");
        fclose(f);
        return status;
 }
@@ -513,7 +552,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).
@@ -553,20 +592,7 @@ static int status_merge(void *status, package_t *pkgs)
 
        // Print out packages we processed.
        for (pkg = pkgs; pkg != 0; pkg = pkg->next) {
-               fprintf(fout, "Package: %s\nStatus: %s %s %s\n", 
-                       pkg->package, state_words_want[pkg->state_want - 1],
-                               state_words_flag[pkg->state_flag - 1],
-                               state_words_status[pkg->state_status - 1]);
-
-               if (pkg->depends)
-                       fprintf(fout, "Depends: %s\n", pkg->depends);
-               if (pkg->provides)
-                       fprintf(fout, "Provides: %s\n", pkg->provides);
-               if (pkg->installer_menu_item)
-                       fprintf(fout, "installer-menu-item: %i\n", pkg->installer_menu_item);
-               if (pkg->description)
-                       fprintf(fout, "Description: %s\n", pkg->description);
-               fputc('\n', fout);
+               write_package(fout, pkg);
        }
        fclose(fout);