Apple-2gs-SW/hush
1
0
Fork 0
mirror of https://github.com/sheumann/hush.git synced 2024-12-25 18:33:06 +00:00
Code Issues Projects Releases Wiki Activity

dpkg_deb had not been updated for the new gunzip interface. Fix it.

Browse Source 
-Erik
This commit is contained in:
Eric Andersen 2001-04-05 06:04:11 +00:00
parent e76c3b08e1
commit fdefbbbe85
2 changed files with 32 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
archival/dpkg_deb.c
View File

@ -26,6 +26,10 @@
#include <stdlib.h> #include <stdlib.h>
#include "busybox.h" #include "busybox.h"
/* From gunzip.c */
extern int gz_open(FILE *compressed_file, int *pid);
extern void gz_close(int gunzip_pid);
typedef struct ar_headers_s { typedef struct ar_headers_s {
char *name; char *name;
size_t size; size_t size;
@ -60,6 +64,8 @@ extern int deb_extract(int optflags, const char *dir_name, const char *deb_filen
int extract_to_stdout = FALSE; int extract_to_stdout = FALSE;
int srcFd = 0; int srcFd = 0;
int status; int status;
pid_t pid;
FILE *comp_file = NULL;
if (dpkg_deb_contents == (dpkg_deb_contents & optflags)) { if (dpkg_deb_contents == (dpkg_deb_contents & optflags)) {
strcpy(ar_filename, "data.tar.gz"); strcpy(ar_filename, "data.tar.gz");
@ -99,7 +105,11 @@ extern int deb_extract(int optflags, const char *dir_name, const char *deb_filen
ar_headers = ar_headers->next; ar_headers = ar_headers->next;
} }
lseek(srcFd, ar_headers->offset, SEEK_SET); lseek(srcFd, ar_headers->offset, SEEK_SET);
srcFd = tar_unzip_init(srcFd); /* Uncompress the file */
comp_file = fdopen(srcFd, "r");
if ((srcFd = gz_open(comp_file, &pid)) == EXIT_FAILURE) {
error_msg_and_die("Couldnt unzip file");
}
if ( dir_name != NULL) { if ( dir_name != NULL) {
if (is_directory(dir_name, TRUE, NULL)==FALSE) { if (is_directory(dir_name, TRUE, NULL)==FALSE) {
mkdir(dir_name, 0755); mkdir(dir_name, 0755);
@ -108,7 +118,11 @@ extern int deb_extract(int optflags, const char *dir_name, const char *deb_filen
error_msg_and_die("Cannot change to dir %s", dir_name); error_msg_and_die("Cannot change to dir %s", dir_name);
} }
} }
status = readTarFile(srcFd, extract_flag, list_flag, extract_to_stdout, verbose_flag, NULL, extract_list); status = readTarFile(srcFd, extract_flag, list_flag,
extract_to_stdout, verbose_flag, NULL, extract_list);
close(srcFd);
gz_close(pid);
fclose(comp_file);
return status; return status;
} }

18
dpkg_deb.c
View File

@ -26,6 +26,10 @@
#include <stdlib.h> #include <stdlib.h>
#include "busybox.h" #include "busybox.h"
/* From gunzip.c */
extern int gz_open(FILE *compressed_file, int *pid);
extern void gz_close(int gunzip_pid);
typedef struct ar_headers_s { typedef struct ar_headers_s {
char *name; char *name;
size_t size; size_t size;
@ -60,6 +64,8 @@ extern int deb_extract(int optflags, const char *dir_name, const char *deb_filen
int extract_to_stdout = FALSE; int extract_to_stdout = FALSE;
int srcFd = 0; int srcFd = 0;
int status; int status;
pid_t pid;
FILE *comp_file = NULL;
if (dpkg_deb_contents == (dpkg_deb_contents & optflags)) { if (dpkg_deb_contents == (dpkg_deb_contents & optflags)) {
strcpy(ar_filename, "data.tar.gz"); strcpy(ar_filename, "data.tar.gz");
@ -99,7 +105,11 @@ extern int deb_extract(int optflags, const char *dir_name, const char *deb_filen
ar_headers = ar_headers->next; ar_headers = ar_headers->next;
} }
lseek(srcFd, ar_headers->offset, SEEK_SET); lseek(srcFd, ar_headers->offset, SEEK_SET);
srcFd = tar_unzip_init(srcFd); /* Uncompress the file */
comp_file = fdopen(srcFd, "r");
if ((srcFd = gz_open(comp_file, &pid)) == EXIT_FAILURE) {
error_msg_and_die("Couldnt unzip file");
}
if ( dir_name != NULL) { if ( dir_name != NULL) {
if (is_directory(dir_name, TRUE, NULL)==FALSE) { if (is_directory(dir_name, TRUE, NULL)==FALSE) {
mkdir(dir_name, 0755); mkdir(dir_name, 0755);
@ -108,7 +118,11 @@ extern int deb_extract(int optflags, const char *dir_name, const char *deb_filen
error_msg_and_die("Cannot change to dir %s", dir_name); error_msg_and_die("Cannot change to dir %s", dir_name);
} }
} }
status = readTarFile(srcFd, extract_flag, list_flag, extract_to_stdout, verbose_flag, NULL, extract_list); status = readTarFile(srcFd, extract_flag, list_flag,
extract_to_stdout, verbose_flag, NULL, extract_list);
close(srcFd);
gz_close(pid);
fclose(comp_file);
return status; return status;
} }