aboutsummaryrefslogtreecommitdiff
path: root/archival/dpkg_deb.c
diff options
context:
space:
mode:
authorbug1 <bug1@69ca8d6d-28ef-0310-b511-8ec308f3f277>2002-11-13 00:24:20 +0000
committerbug1 <bug1@69ca8d6d-28ef-0310-b511-8ec308f3f277>2002-11-13 00:24:20 +0000
commite19fd06c60c38f8011b912ac7b90f02cac9b4250 (patch)
treee5ef4635958a251b3a751437841471ba85c44665 /archival/dpkg_deb.c
parent0d341fa3aae40bf610c39a7cad3fc436558e9721 (diff)
downloadbusybox-w32-e19fd06c60c38f8011b912ac7b90f02cac9b4250.tar.gz
busybox-w32-e19fd06c60c38f8011b912ac7b90f02cac9b4250.tar.bz2
busybox-w32-e19fd06c60c38f8011b912ac7b90f02cac9b4250.zip
Minor cleanups
git-svn-id: svn://busybox.net/trunk/busybox@5915 69ca8d6d-28ef-0310-b511-8ec308f3f277
Diffstat (limited to 'archival/dpkg_deb.c')
-rw-r--r--archival/dpkg_deb.c17
1 files changed, 0 insertions, 17 deletions
diff --git a/archival/dpkg_deb.c b/archival/dpkg_deb.c
index c46739553..7ce637e5e 100644
--- a/archival/dpkg_deb.c
+++ b/archival/dpkg_deb.c
@@ -29,13 +29,6 @@ extern int dpkg_deb_main(int argc, char **argv)
29#ifndef CONFIG_FEATURE_DPKG_DEB_EXTRACT_ONLY 29#ifndef CONFIG_FEATURE_DPKG_DEB_EXTRACT_ONLY
30 const llist_t *control_tar_llist = NULL; 30 const llist_t *control_tar_llist = NULL;
31#endif 31#endif
32#ifndef CONFIG_AR
33 char magic[7];
34#endif
35
36 /* a .deb file is an ar archive that contain three files,
37 * data.tar.gz, control.tar.gz and debian
38 */
39 32
40 /* Setup the tar archive handle */ 33 /* Setup the tar archive handle */
41 tar_archive = init_handle(); 34 tar_archive = init_handle();
@@ -104,17 +97,7 @@ extern int dpkg_deb_main(int argc, char **argv)
104 mkdir(argv[optind], 0777); 97 mkdir(argv[optind], 0777);
105 chdir(argv[optind]); 98 chdir(argv[optind]);
106 99
107#ifdef CONFIG_AR
108 unpack_ar_archive(ar_archive); 100 unpack_ar_archive(ar_archive);
109#else
110 xread_all(ar_archive->src_fd, magic, 7);
111 if (strncmp(magic, "!<arch>", 7) != 0) {
112 error_msg_and_die("Invalid ar magic");
113 }
114 ar_archive->offset += 7;
115
116 while (get_header_ar(ar_archive) == EXIT_SUCCESS);
117#endif
118 101
119 /* Cleanup */ 102 /* Cleanup */
120 close (ar_archive->src_fd); 103 close (ar_archive->src_fd);