summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGlenn L McGrath2001-10-03 03:10:35 +0000
committerGlenn L McGrath2001-10-03 03:10:35 +0000
commit35636540ea96c11a4cd58e733279a8daea9b8dee (patch)
tree43c4bdfedb52ab21669da60e8f5e50f20b5f1322
parent5c72104a85dfe5c0934c85e29e9c11f741a5fe39 (diff)
downloadbusybox-35636540ea96c11a4cd58e733279a8daea9b8dee.zip
busybox-35636540ea96c11a4cd58e733279a8daea9b8dee.tar.gz
Extract control.tar.gz and data.tar.gz unconditionally, another one picked up by Stefan
-rw-r--r--archival/dpkg.c5
-rw-r--r--dpkg.c5
2 files changed, 6 insertions, 4 deletions
diff --git a/archival/dpkg.c b/archival/dpkg.c
index a3fd90c..06d722c 100644
--- a/archival/dpkg.c
+++ b/archival/dpkg.c
@@ -2,6 +2,7 @@
* Mini dpkg implementation for busybox.
* This is not meant as a replacemnt for dpkg
*
+ * Written By Glenn McGrath with the help of others
* Copyright (C) 2001 by Glenn McGrath
*
* Started life as a busybox implementation of udpkg
@@ -1281,7 +1282,7 @@ void unpack_package(deb_file_t *deb_file)
/* Extract control.tar.gz to /var/lib/dpkg/info/<package>.filename */
info_prefix = (char *) xmalloc(sizeof(package_name) + 20 + 4 + 1);
sprintf(info_prefix, "/var/lib/dpkg/info/%s.", package_name);
- deb_extract(deb_file->filename, stdout, (extract_quiet | extract_control_tar_gz | extract_all_to_fs), info_prefix, NULL);
+ deb_extract(deb_file->filename, stdout, (extract_quiet | extract_control_tar_gz | extract_all_to_fs | extract_unconditional), info_prefix, NULL);
/* Run the preinst prior to extracting */
return_value = run_package_script(package_name, "preinst");
@@ -1294,7 +1295,7 @@ void unpack_package(deb_file_t *deb_file)
}
/* Extract data.tar.gz to the root directory */
- deb_extract(deb_file->filename, stdout, (extract_quiet | extract_data_tar_gz | extract_all_to_fs), "/", NULL);
+ deb_extract(deb_file->filename, stdout, (extract_quiet | extract_data_tar_gz | extract_all_to_fs | extract_unconditional), "/", NULL);
/* Create the list file */
strcat(info_prefix, "list");
diff --git a/dpkg.c b/dpkg.c
index a3fd90c..06d722c 100644
--- a/dpkg.c
+++ b/dpkg.c
@@ -2,6 +2,7 @@
* Mini dpkg implementation for busybox.
* This is not meant as a replacemnt for dpkg
*
+ * Written By Glenn McGrath with the help of others
* Copyright (C) 2001 by Glenn McGrath
*
* Started life as a busybox implementation of udpkg
@@ -1281,7 +1282,7 @@ void unpack_package(deb_file_t *deb_file)
/* Extract control.tar.gz to /var/lib/dpkg/info/<package>.filename */
info_prefix = (char *) xmalloc(sizeof(package_name) + 20 + 4 + 1);
sprintf(info_prefix, "/var/lib/dpkg/info/%s.", package_name);
- deb_extract(deb_file->filename, stdout, (extract_quiet | extract_control_tar_gz | extract_all_to_fs), info_prefix, NULL);
+ deb_extract(deb_file->filename, stdout, (extract_quiet | extract_control_tar_gz | extract_all_to_fs | extract_unconditional), info_prefix, NULL);
/* Run the preinst prior to extracting */
return_value = run_package_script(package_name, "preinst");
@@ -1294,7 +1295,7 @@ void unpack_package(deb_file_t *deb_file)
}
/* Extract data.tar.gz to the root directory */
- deb_extract(deb_file->filename, stdout, (extract_quiet | extract_data_tar_gz | extract_all_to_fs), "/", NULL);
+ deb_extract(deb_file->filename, stdout, (extract_quiet | extract_data_tar_gz | extract_all_to_fs | extract_unconditional), "/", NULL);
/* Create the list file */
strcat(info_prefix, "list");