diff options
author | Glenn L McGrath <bug1@ihug.co.nz> | 2001-10-03 03:10:35 +0000 |
---|---|---|
committer | Glenn L McGrath <bug1@ihug.co.nz> | 2001-10-03 03:10:35 +0000 |
commit | 35636540ea96c11a4cd58e733279a8daea9b8dee (patch) | |
tree | 43c4bdfedb52ab21669da60e8f5e50f20b5f1322 | |
parent | 5c72104a85dfe5c0934c85e29e9c11f741a5fe39 (diff) | |
download | busybox-w32-35636540ea96c11a4cd58e733279a8daea9b8dee.tar.gz busybox-w32-35636540ea96c11a4cd58e733279a8daea9b8dee.tar.bz2 busybox-w32-35636540ea96c11a4cd58e733279a8daea9b8dee.zip |
Extract control.tar.gz and data.tar.gz unconditionally, another one picked up by Stefan
-rw-r--r-- | archival/dpkg.c | 5 | ||||
-rw-r--r-- | dpkg.c | 5 |
2 files changed, 6 insertions, 4 deletions
diff --git a/archival/dpkg.c b/archival/dpkg.c index a3fd90c35..06d722c9d 100644 --- a/archival/dpkg.c +++ b/archival/dpkg.c | |||
@@ -2,6 +2,7 @@ | |||
2 | * Mini dpkg implementation for busybox. | 2 | * Mini dpkg implementation for busybox. |
3 | * This is not meant as a replacemnt for dpkg | 3 | * This is not meant as a replacemnt for dpkg |
4 | * | 4 | * |
5 | * Written By Glenn McGrath with the help of others | ||
5 | * Copyright (C) 2001 by Glenn McGrath | 6 | * Copyright (C) 2001 by Glenn McGrath |
6 | * | 7 | * |
7 | * Started life as a busybox implementation of udpkg | 8 | * Started life as a busybox implementation of udpkg |
@@ -1281,7 +1282,7 @@ void unpack_package(deb_file_t *deb_file) | |||
1281 | /* Extract control.tar.gz to /var/lib/dpkg/info/<package>.filename */ | 1282 | /* Extract control.tar.gz to /var/lib/dpkg/info/<package>.filename */ |
1282 | info_prefix = (char *) xmalloc(sizeof(package_name) + 20 + 4 + 1); | 1283 | info_prefix = (char *) xmalloc(sizeof(package_name) + 20 + 4 + 1); |
1283 | sprintf(info_prefix, "/var/lib/dpkg/info/%s.", package_name); | 1284 | sprintf(info_prefix, "/var/lib/dpkg/info/%s.", package_name); |
1284 | deb_extract(deb_file->filename, stdout, (extract_quiet | extract_control_tar_gz | extract_all_to_fs), info_prefix, NULL); | 1285 | deb_extract(deb_file->filename, stdout, (extract_quiet | extract_control_tar_gz | extract_all_to_fs | extract_unconditional), info_prefix, NULL); |
1285 | 1286 | ||
1286 | /* Run the preinst prior to extracting */ | 1287 | /* Run the preinst prior to extracting */ |
1287 | return_value = run_package_script(package_name, "preinst"); | 1288 | return_value = run_package_script(package_name, "preinst"); |
@@ -1294,7 +1295,7 @@ void unpack_package(deb_file_t *deb_file) | |||
1294 | } | 1295 | } |
1295 | 1296 | ||
1296 | /* Extract data.tar.gz to the root directory */ | 1297 | /* Extract data.tar.gz to the root directory */ |
1297 | deb_extract(deb_file->filename, stdout, (extract_quiet | extract_data_tar_gz | extract_all_to_fs), "/", NULL); | 1298 | deb_extract(deb_file->filename, stdout, (extract_quiet | extract_data_tar_gz | extract_all_to_fs | extract_unconditional), "/", NULL); |
1298 | 1299 | ||
1299 | /* Create the list file */ | 1300 | /* Create the list file */ |
1300 | strcat(info_prefix, "list"); | 1301 | strcat(info_prefix, "list"); |
@@ -2,6 +2,7 @@ | |||
2 | * Mini dpkg implementation for busybox. | 2 | * Mini dpkg implementation for busybox. |
3 | * This is not meant as a replacemnt for dpkg | 3 | * This is not meant as a replacemnt for dpkg |
4 | * | 4 | * |
5 | * Written By Glenn McGrath with the help of others | ||
5 | * Copyright (C) 2001 by Glenn McGrath | 6 | * Copyright (C) 2001 by Glenn McGrath |
6 | * | 7 | * |
7 | * Started life as a busybox implementation of udpkg | 8 | * Started life as a busybox implementation of udpkg |
@@ -1281,7 +1282,7 @@ void unpack_package(deb_file_t *deb_file) | |||
1281 | /* Extract control.tar.gz to /var/lib/dpkg/info/<package>.filename */ | 1282 | /* Extract control.tar.gz to /var/lib/dpkg/info/<package>.filename */ |
1282 | info_prefix = (char *) xmalloc(sizeof(package_name) + 20 + 4 + 1); | 1283 | info_prefix = (char *) xmalloc(sizeof(package_name) + 20 + 4 + 1); |
1283 | sprintf(info_prefix, "/var/lib/dpkg/info/%s.", package_name); | 1284 | sprintf(info_prefix, "/var/lib/dpkg/info/%s.", package_name); |
1284 | deb_extract(deb_file->filename, stdout, (extract_quiet | extract_control_tar_gz | extract_all_to_fs), info_prefix, NULL); | 1285 | deb_extract(deb_file->filename, stdout, (extract_quiet | extract_control_tar_gz | extract_all_to_fs | extract_unconditional), info_prefix, NULL); |
1285 | 1286 | ||
1286 | /* Run the preinst prior to extracting */ | 1287 | /* Run the preinst prior to extracting */ |
1287 | return_value = run_package_script(package_name, "preinst"); | 1288 | return_value = run_package_script(package_name, "preinst"); |
@@ -1294,7 +1295,7 @@ void unpack_package(deb_file_t *deb_file) | |||
1294 | } | 1295 | } |
1295 | 1296 | ||
1296 | /* Extract data.tar.gz to the root directory */ | 1297 | /* Extract data.tar.gz to the root directory */ |
1297 | deb_extract(deb_file->filename, stdout, (extract_quiet | extract_data_tar_gz | extract_all_to_fs), "/", NULL); | 1298 | deb_extract(deb_file->filename, stdout, (extract_quiet | extract_data_tar_gz | extract_all_to_fs | extract_unconditional), "/", NULL); |
1298 | 1299 | ||
1299 | /* Create the list file */ | 1300 | /* Create the list file */ |
1300 | strcat(info_prefix, "list"); | 1301 | strcat(info_prefix, "list"); |