Ahem: add new faq entry to list at top of FAQ.html

[oweals/busybox.git] / archival / dpkg_deb.c

diff --git a/archival/dpkg_deb.c b/archival/dpkg_deb.c
index 450b04b8ed943365bf0673f607c3d0c1d541d9cc..b95ec2d6ef755dc9a56c845c61a9bc369a2716ab 100644 (file)
--- a/archival/dpkg_deb.c
+++ b/archival/dpkg_deb.c
@@ -12,70 +12,101 @@
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *
  */
-
+#include <fcntl.h>
 #include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
 #include <getopt.h>
+
+#include "unarchive.h"
 #include "busybox.h"
 
+#define DPKG_DEB_OPT_CONTENTS  1
+#define DPKG_DEB_OPT_CONTROL   2
+#define DPKG_DEB_OPT_FIELD     4
+#define DPKG_DEB_OPT_EXTRACT   8
+#define DPKG_DEB_OPT_EXTRACT_VERBOSE   16
+
 extern int dpkg_deb_main(int argc, char **argv)
 {
-       const int dpkg_deb_contents = 1;
-       const int dpkg_deb_control = 2;
-//     const int dpkg_deb_info = 4;
-       const int dpkg_deb_extract = 8;
-       const int dpkg_deb_verbose_extract = 16;
-       const int dpkg_deb_list = 32;
-       char *target_dir = NULL;
-       int opt = 0;
-       int optflag = 0;        
-       
-       while ((opt = getopt(argc, argv, "cexXl")) != -1) {
-               switch (opt) {
-                       case 'c':
-                               optflag |= dpkg_deb_contents;
-                               break;
-                       case 'e':
-                               optflag |= dpkg_deb_control;
-                               break;
-                       case 'X':
-                               optflag |= dpkg_deb_verbose_extract;
-                               break;
-                       case 'x':
-                               optflag |= dpkg_deb_extract;
-                               break;
-                       case 'l':
-                               optflag |= dpkg_deb_list;
-                               break;
-/*                     case 'I':
-                               optflag |= dpkg_deb_info;
-                               break;
-*/
-                       default:
-                               show_usage();
-               }
-       }
+       archive_handle_t *ar_archive;
+       archive_handle_t *tar_archive;
+       llist_t *control_tar_llist = NULL;
+       unsigned long opt;
+       char *extract_dir = NULL;
+       short argcount = 1;
+
+       /* Setup the tar archive handle */
+       tar_archive = init_handle();
+
+       /* Setup an ar archive handle that refers to the gzip sub archive */
+       ar_archive = init_handle();
+       ar_archive->sub_archive = tar_archive;
+       ar_archive->filter = filter_accept_list_reassign;
+
+#ifdef CONFIG_FEATURE_DEB_TAR_GZ
+       ar_archive->accept = llist_add_to(NULL, "data.tar.gz");
+       control_tar_llist = llist_add_to(NULL, "control.tar.gz");
+#endif
+
+#ifdef CONFIG_FEATURE_DEB_TAR_BZ2
+       ar_archive->accept = llist_add_to(ar_archive->accept, "data.tar.bz2");
+       control_tar_llist = llist_add_to(control_tar_llist, "control.tar.bz2");
+#endif
+
+       bb_opt_complementaly = "c~efXx:e~cfXx:f~ceXx:X~cefx:x~cefX";
+       opt = bb_getopt_ulflags(argc, argv, "cefXx");
 
-       if (((optind + 1 ) > argc) || (optflag == 0))  {
-               show_usage();
+       if (opt & DPKG_DEB_OPT_CONTENTS) {
+               tar_archive->action_header = header_verbose_list;
        }
-       if ((optflag & dpkg_deb_control) || (optflag & dpkg_deb_extract) || (optflag & dpkg_deb_verbose_extract)) {
-               if ( (optind + 1) == argc ) {
-                       target_dir = (char *) xmalloc(7);
-                       strcpy(target_dir, "DEBIAN");
+       if (opt & DPKG_DEB_OPT_CONTROL) {
+               ar_archive->accept = control_tar_llist;
+               tar_archive->action_data = data_extract_all;
+               if (optind + 1 == argc) {
+                       extract_dir = "./DEBIAN";
                } else {
-                       target_dir = (char *) xmalloc(strlen(argv[optind + 1]));
-                       strcpy(target_dir, argv[optind + 1]);
+                       argcount++;
                }
        }
-       deb_extract(optflag, target_dir, argv[optind]);
-/*     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]);
+       if (opt & DPKG_DEB_OPT_FIELD) {
+               /* Print the entire control file
+                * it should accept a second argument which specifies a
+                * specific field to print */
+               ar_archive->accept = control_tar_llist;
+               tar_archive->accept = llist_add_to(NULL, "./control");;
+               tar_archive->filter = filter_accept_list;
+               tar_archive->action_data = data_extract_to_stdout;
        }
-*/
+       if (opt & DPKG_DEB_OPT_EXTRACT) {
+               tar_archive->action_header = header_list;
+       }
+       if (opt & (DPKG_DEB_OPT_EXTRACT_VERBOSE | DPKG_DEB_OPT_EXTRACT)) {
+               tar_archive->action_data = data_extract_all;
+               argcount = 2;
+       }
+
+       if ((optind + argcount != argc) || (opt & BB_GETOPT_ERROR)) {
+               bb_show_usage();
+       }
+
+       tar_archive->src_fd = ar_archive->src_fd = bb_xopen(argv[optind++], O_RDONLY);
+
+       /* Workout where to extract the files */
+       /* 2nd argument is a dir name */
+       if (argv[optind]) {
+               extract_dir = argv[optind];
+       }
+       if (extract_dir) {
+               mkdir(extract_dir, 0777);
+               chdir(extract_dir);
+       }
+       unpack_ar_archive(ar_archive);
+
+       /* Cleanup */
+       close (ar_archive->src_fd);
+
        return(EXIT_SUCCESS);
 }