Another update from Larry:

[oweals/busybox.git] / dpkg_deb.c

diff --git a/dpkg_deb.c b/dpkg_deb.c
index 6653f2a7cf83e002de490dd576c6b2516d5bdbc4..d088828857b86730f1ebf9233374300f93a9a8fc 100644 (file)
--- a/dpkg_deb.c
+++ b/dpkg_deb.c
@@ -15,16 +15,18 @@
  */
 
 #include <stdlib.h>
+#include <string.h>
 #include <getopt.h>
 #include "busybox.h"
 
 extern int dpkg_deb_main(int argc, char **argv)
 {
-       char *target_dir;
+       char *argument = NULL;
+       char *output_buffer = NULL;
        int opt = 0;
        int optflag = 0;        
        
-       while ((opt = getopt(argc, argv, "cexXl")) != -1) {
+       while ((opt = getopt(argc, argv, "ceftXxI")) != -1) {
                switch (opt) {
                        case 'c':
                                optflag |= extract_contents;
@@ -32,19 +34,21 @@ extern int dpkg_deb_main(int argc, char **argv)
                        case 'e':
                                optflag |= extract_control;
                                break;
+                       case 'f':
+                               optflag |= extract_field;
+                               break;
+                       case 't':
+                               optflag |= extract_fsys_tarfile;
+                               break;
                        case 'X':
                                optflag |= extract_verbose_extract;
                                break;
                        case 'x':
                                optflag |= extract_extract;
                                break;
-                       case 'l':
-                               optflag |= extract_list;
-                               break;
-/*                     case 'I':
+                       case 'I':
                                optflag |= extract_info;
                                break;
-*/
                        default:
                                show_usage();
                }
@@ -58,26 +62,48 @@ extern int dpkg_deb_main(int argc, char **argv)
                case (extract_control):
                case (extract_extract):
                case (extract_verbose_extract):
+                       /* argument is a dir name */
                        if ( (optind + 1) == argc ) {
-                               target_dir = (char *) xmalloc(7);
-                               strcpy(target_dir, "DEBIAN");
+                               argument = xstrdup("DEBIAN");
                        } else {
-                               target_dir = (char *) xmalloc(strlen(argv[optind + 1]) + 1);
-                               strcpy(target_dir, argv[optind + 1]);
+                               argument = xstrdup(argv[optind + 1]);
                        }
                        break;
+               case (extract_field):
+                       /* argument is a control field name */
+                       if ((optind + 1) != argc) {
+                               argument = xstrdup(argv[optind + 1]);                           
+                       }
+                       break;
+               case (extract_info):
+                       /* argument is a control field name */
+                       if ((optind + 1) != argc) {
+                               argument = xstrdup(argv[optind + 1]);
+                               break;
+                       } else {
+                               error_msg("-I currently requires a filename to be specifies");
+                               return(EXIT_FAILURE);
+                       }
+                       /* argument is a filename */
                default:
-                       target_dir = NULL;
        }
 
-       deb_extract(argv[optind], optflag, target_dir);
-/*     else if (optflag & dpkg_deb_info) {
-               extract_flag = TRUE;
-               extract_to_stdout = TRUE;
-               strcpy(ar_filename, "control.tar.gz");
-               extract_list = argv+optind+1;
-               printf("list one is [%s]\n",extract_list[0]);
+       output_buffer = deb_extract(argv[optind], optflag, argument, NULL);
+
+       if (optflag & extract_field) {
+               char *field = NULL;
+               int field_length = 0;
+               int field_start = 0;
+
+               while ((field = read_package_field(&output_buffer[field_start])) != NULL) {
+                       field_length = strlen(field);
+                       field_start += (field_length + 1);
+                       if (strstr(field, argument) == field) {
+                               printf("%s\n", field + strlen(argument) + 2);
+                       }
+                       free(field);
+               }
        }
-*/
+
        return(EXIT_SUCCESS);
 }