aboutsummaryrefslogtreecommitdiff
path: root/archival/dpkg.c
diff options
context:
space:
mode:
Diffstat (limited to 'archival/dpkg.c')
-rw-r--r--archival/dpkg.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/archival/dpkg.c b/archival/dpkg.c
index 5535c15a1..126138f80 100644
--- a/archival/dpkg.c
+++ b/archival/dpkg.c
@@ -1417,10 +1417,10 @@ static void init_archive_deb_control(archive_handle_t *ar_handle)
1417 1417
1418 /* We don't care about data.tar.* or debian-binary, just control.tar.* */ 1418 /* We don't care about data.tar.* or debian-binary, just control.tar.* */
1419#ifdef CONFIG_FEATURE_DEB_TAR_GZ 1419#ifdef CONFIG_FEATURE_DEB_TAR_GZ
1420 llist_add_to(&(ar_handle->accept), "control.tar.gz"); 1420 llist_add_to(&(ar_handle->accept), (char*)"control.tar.gz");
1421#endif 1421#endif
1422#ifdef CONFIG_FEATURE_DEB_TAR_BZ2 1422#ifdef CONFIG_FEATURE_DEB_TAR_BZ2
1423 llist_add_to(&(ar_handle->accept), "control.tar.bz2"); 1423 llist_add_to(&(ar_handle->accept), (char*)"control.tar.bz2");
1424#endif 1424#endif
1425 1425
1426 /* Assign the tar handle as a subarchive of the ar handle */ 1426 /* Assign the tar handle as a subarchive of the ar handle */
@@ -1439,10 +1439,10 @@ static void init_archive_deb_data(archive_handle_t *ar_handle)
1439 1439
1440 /* We don't care about control.tar.* or debian-binary, just data.tar.* */ 1440 /* We don't care about control.tar.* or debian-binary, just data.tar.* */
1441#ifdef CONFIG_FEATURE_DEB_TAR_GZ 1441#ifdef CONFIG_FEATURE_DEB_TAR_GZ
1442 llist_add_to(&(ar_handle->accept), "data.tar.gz"); 1442 llist_add_to(&(ar_handle->accept), (char*)"data.tar.gz");
1443#endif 1443#endif
1444#ifdef CONFIG_FEATURE_DEB_TAR_BZ2 1444#ifdef CONFIG_FEATURE_DEB_TAR_BZ2
1445 llist_add_to(&(ar_handle->accept), "data.tar.bz2"); 1445 llist_add_to(&(ar_handle->accept), (char*)"data.tar.bz2");
1446#endif 1446#endif
1447 1447
1448 /* Assign the tar handle as a subarchive of the ar handle */ 1448 /* Assign the tar handle as a subarchive of the ar handle */
@@ -1525,7 +1525,7 @@ static void unpack_package(deb_file_t *deb_file)
1525 archive_handle = init_archive_deb_ar(deb_file->filename); 1525 archive_handle = init_archive_deb_ar(deb_file->filename);
1526 init_archive_deb_data(archive_handle); 1526 init_archive_deb_data(archive_handle);
1527 archive_handle->sub_archive->action_data = data_extract_all_prefix; 1527 archive_handle->sub_archive->action_data = data_extract_all_prefix;
1528 archive_handle->sub_archive->buffer = "/"; 1528 archive_handle->sub_archive->buffer = (char*)"/"; /* huh? */
1529 archive_handle->sub_archive->flags |= ARCHIVE_EXTRACT_UNCONDITIONAL; 1529 archive_handle->sub_archive->flags |= ARCHIVE_EXTRACT_UNCONDITIONAL;
1530 unpack_ar_archive(archive_handle); 1530 unpack_ar_archive(archive_handle);
1531 1531
@@ -1629,7 +1629,7 @@ int dpkg_main(int argc, char **argv)
1629 llist_t *control_list = NULL; 1629 llist_t *control_list = NULL;
1630 1630
1631 /* Extract the control file */ 1631 /* Extract the control file */
1632 llist_add_to(&control_list, "./control"); 1632 llist_add_to(&control_list, (char*)"./control");
1633 archive_handle = init_archive_deb_ar(argv[0]); 1633 archive_handle = init_archive_deb_ar(argv[0]);
1634 init_archive_deb_control(archive_handle); 1634 init_archive_deb_control(archive_handle);
1635 deb_file[deb_count]->control_file = deb_extract_control_file_to_buffer(archive_handle, control_list); 1635 deb_file[deb_count]->control_file = deb_extract_control_file_to_buffer(archive_handle, control_list);