emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix dpkg-deb, enum's are cool

Browse Source
This commit is contained in:
Glenn L McGrath 2001-04-12 10:19:08 +00:00
parent 46079a1d77
commit 359c106871
6 changed files with 108 additions and 95 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
archival/dpkg_deb.c
View File

@ -20,12 +20,6 @@
extern int dpkg_deb_main(int argc, char **argv) extern int dpkg_deb_main(int argc, char **argv)
{ {
const int dpkg_deb_contents = 1;
const int dpkg_deb_control = 2;
// const int dpkg_deb_info = 4;
const int dpkg_deb_extract = 8;
const int dpkg_deb_verbose_extract = 16;
const int dpkg_deb_list = 32;
char *target_dir = NULL; char *target_dir = NULL;
int opt = 0; int opt = 0;
int optflag = 0; int optflag = 0;
@ -33,22 +27,22 @@ extern int dpkg_deb_main(int argc, char **argv)
while ((opt = getopt(argc, argv, "cexXl")) != -1) { while ((opt = getopt(argc, argv, "cexXl")) != -1) {
switch (opt) { switch (opt) {
case 'c': case 'c':
optflag |= dpkg_deb_contents; optflag |= extract_contents;
break; break;
case 'e': case 'e':
optflag |= dpkg_deb_control; optflag |= extract_control;
break; break;
case 'X': case 'X':
optflag |= dpkg_deb_verbose_extract; optflag |= extract_verbose_extract;
break; break;
case 'x': case 'x':
optflag |= dpkg_deb_extract; optflag |= extract_extract;
break; break;
case 'l': case 'l':
optflag |= dpkg_deb_list; optflag |= extract_list;
break; break;
/* case 'I': /* case 'I':
optflag |= dpkg_deb_info; optflag |= extract_info;
break; break;
*/ */
default: default:
@ -59,14 +53,19 @@ extern int dpkg_deb_main(int argc, char **argv)
if (((optind + 1 ) > argc) || (optflag == 0)) { if (((optind + 1 ) > argc) || (optflag == 0)) {
show_usage(); show_usage();
} }
if ((optflag & dpkg_deb_control) || (optflag & dpkg_deb_extract) || (optflag & dpkg_deb_verbose_extract)) { switch (optflag) {
if ( (optind + 1) == argc ) { case (extract_control):
target_dir = (char *) xmalloc(7); case (extract_extract):
strcpy(target_dir, "DEBIAN"); case (extract_verbose_extract):
} else { if ( (optind + 1) == argc ) {
target_dir = (char *) xmalloc(7);
strcpy(target_dir, "DEBIAN");
}
break;
default: {
target_dir = (char *) xmalloc(strlen(argv[optind + 1])); target_dir = (char *) xmalloc(strlen(argv[optind + 1]));
strcpy(target_dir, argv[optind + 1]); strcpy(target_dir, argv[optind + 1]);
} }
} }
deb_extract(argv[optind], optflag, target_dir); deb_extract(argv[optind], optflag, target_dir);
/* else if (optflag & dpkg_deb_info) { /* else if (optflag & dpkg_deb_info) {

35
dpkg_deb.c
View File

@ -20,12 +20,6 @@
extern int dpkg_deb_main(int argc, char **argv) extern int dpkg_deb_main(int argc, char **argv)
{ {
const int dpkg_deb_contents = 1;
const int dpkg_deb_control = 2;
// const int dpkg_deb_info = 4;
const int dpkg_deb_extract = 8;
const int dpkg_deb_verbose_extract = 16;
const int dpkg_deb_list = 32;
char *target_dir = NULL; char *target_dir = NULL;
int opt = 0; int opt = 0;
int optflag = 0; int optflag = 0;
@ -33,22 +27,22 @@ extern int dpkg_deb_main(int argc, char **argv)
while ((opt = getopt(argc, argv, "cexXl")) != -1) { while ((opt = getopt(argc, argv, "cexXl")) != -1) {
switch (opt) { switch (opt) {
case 'c': case 'c':
optflag |= dpkg_deb_contents; optflag |= extract_contents;
break; break;
case 'e': case 'e':
optflag |= dpkg_deb_control; optflag |= extract_control;
break; break;
case 'X': case 'X':
optflag |= dpkg_deb_verbose_extract; optflag |= extract_verbose_extract;
break; break;
case 'x': case 'x':
optflag |= dpkg_deb_extract; optflag |= extract_extract;
break; break;
case 'l': case 'l':
optflag |= dpkg_deb_list; optflag |= extract_list;
break; break;
/* case 'I': /* case 'I':
optflag |= dpkg_deb_info; optflag |= extract_info;
break; break;
*/ */
default: default:
@ -59,14 +53,19 @@ extern int dpkg_deb_main(int argc, char **argv)
if (((optind + 1 ) > argc) || (optflag == 0)) { if (((optind + 1 ) > argc) || (optflag == 0)) {
show_usage(); show_usage();
} }
if ((optflag & dpkg_deb_control) || (optflag & dpkg_deb_extract) || (optflag & dpkg_deb_verbose_extract)) { switch (optflag) {
if ( (optind + 1) == argc ) { case (extract_control):
target_dir = (char *) xmalloc(7); case (extract_extract):
strcpy(target_dir, "DEBIAN"); case (extract_verbose_extract):
} else { if ( (optind + 1) == argc ) {
target_dir = (char *) xmalloc(7);
strcpy(target_dir, "DEBIAN");
}
break;
default: {
target_dir = (char *) xmalloc(strlen(argv[optind + 1])); target_dir = (char *) xmalloc(strlen(argv[optind + 1]));
strcpy(target_dir, argv[optind + 1]); strcpy(target_dir, argv[optind + 1]);
} }
} }
deb_extract(argv[optind], optflag, target_dir); deb_extract(argv[optind], optflag, target_dir);
/* else if (optflag & dpkg_deb_info) { /* else if (optflag & dpkg_deb_info) {

14
include/libbb.h
View File

@ -227,8 +227,18 @@ typedef struct ar_headers_s {
} ar_headers_t; } ar_headers_t;
extern ar_headers_t *get_ar_headers(FILE *in_file); extern ar_headers_t *get_ar_headers(FILE *in_file);
extern int seek_ared_file(FILE *in_file, ar_headers_t *headers, const char *tar_gz_file); extern int seek_ared_file(FILE *in_file, ar_headers_t *headers, const char *tar_gz_file);
extern int deb_extract(const char *package_filename, const int function, char *target_dir);
extern int untar(FILE *src_tar_file, int untar_function, char *base_path); typedef enum extract_function_e {
extract_contents = 1,
extract_control = 2,
extract_info = 4,
extract_extract = 8,
extract_verbose_extract = 16,
extract_list = 32
} extract_function_t;
extern int deb_extract(const char *package_filename, int function, char *target_dir);
extern int untar(FILE *src_tar_file, int function, char *base_path);
extern int unzip(FILE *l_in_file, FILE *l_out_file); extern int unzip(FILE *l_in_file, FILE *l_out_file);
extern void gz_close(int gunzip_pid); extern void gz_close(int gunzip_pid);
extern int gz_open(FILE *compressed_file, int *pid); extern int gz_open(FILE *compressed_file, int *pid);

34
libbb/deb_extract.c
View File

@ -29,25 +29,27 @@
#include <signal.h> #include <signal.h>
#include "libbb.h" #include "libbb.h"
const int dpkg_deb_contents = 1; extern int deb_extract(const char *package_filename, int function, char *target_dir)
const int dpkg_deb_control = 2;
const int dpkg_deb_info = 4;
const int dpkg_deb_extract = 8;
const int dpkg_deb_verbose_extract = 16;
const int dpkg_deb_list = 32;
extern int deb_extract(const char *package_filename, const int function, char *target_dir)
{ {
FILE *deb_file, *uncompressed_file; FILE *deb_file, *uncompressed_file;
ar_headers_t *headers = NULL; ar_headers_t *headers = NULL;
char *ared_file; char *ared_file = NULL;
int gunzip_pid; int gunzip_pid;
if ((function == dpkg_deb_info) || (function == dpkg_deb_control)) { switch (function) {
ared_file = xstrdup("control.tar.gz"); case (extract_info):
} else { case (extract_control):
ared_file = xstrdup("data.tar.gz"); ared_file = xstrdup("control.tar.gz");
break;
case (extract_contents):
case (extract_extract):
case (extract_verbose_extract):
case (extract_list):
ared_file = xstrdup("data.tar.gz");
break;
default:
error_msg("Unknown extraction function");
} }
/* open the debian package to be worked on */ /* open the debian package to be worked on */
@ -70,12 +72,14 @@ extern int deb_extract(const char *package_filename, const int function, char *t
uncompressed_file = fdopen(gz_open(deb_file, &gunzip_pid), "r"); uncompressed_file = fdopen(gz_open(deb_file, &gunzip_pid), "r");
/* get a list of all tar headers inside the .gz file */ /* get a list of all tar headers inside the .gz file */
untar(uncompressed_file, dpkg_deb_extract, target_dir); untar(uncompressed_file, function, target_dir);
/* we are deliberately terminating the child so we can safely ignore this */ /* we are deliberately terminating the child so we can safely ignore this */
signal(SIGTERM, SIG_IGN);
gz_close(gunzip_pid); gz_close(gunzip_pid);
fclose(deb_file); fclose(deb_file);
fclose(uncompressed_file); fclose(uncompressed_file);
free(ared_file);
return(EXIT_SUCCESS); return(EXIT_SUCCESS);
} }

14
libbb/libbb.h
View File

@ -227,8 +227,18 @@ typedef struct ar_headers_s {
} ar_headers_t; } ar_headers_t;
extern ar_headers_t *get_ar_headers(FILE *in_file); extern ar_headers_t *get_ar_headers(FILE *in_file);
extern int seek_ared_file(FILE *in_file, ar_headers_t *headers, const char *tar_gz_file); extern int seek_ared_file(FILE *in_file, ar_headers_t *headers, const char *tar_gz_file);
extern int deb_extract(const char *package_filename, const int function, char *target_dir);
extern int untar(FILE *src_tar_file, int untar_function, char *base_path); typedef enum extract_function_e {
extract_contents = 1,
extract_control = 2,
extract_info = 4,
extract_extract = 8,
extract_verbose_extract = 16,
extract_list = 32
} extract_function_t;
extern int deb_extract(const char *package_filename, int function, char *target_dir);
extern int untar(FILE *src_tar_file, int function, char *base_path);
extern int unzip(FILE *l_in_file, FILE *l_out_file); extern int unzip(FILE *l_in_file, FILE *l_out_file);
extern void gz_close(int gunzip_pid); extern void gz_close(int gunzip_pid);
extern int gz_open(FILE *compressed_file, int *pid); extern int gz_open(FILE *compressed_file, int *pid);

71
libbb/untar.c
View File

@ -44,13 +44,6 @@ extern int untar(FILE *src_tar_file, int untar_function, char *base_path)
char padding[12]; /* 500-512 */ char padding[12]; /* 500-512 */
} raw_tar_header_t; } raw_tar_header_t;
// const int dpkg_deb_contents = 1;
// const int dpkg_deb_control = 2;
// const int dpkg_deb_info = 4;
const int untar_extract = 8;
// const int dpkg_deb_verbose_extract = 16;
// const int dpkg_deb_list = 32;
raw_tar_header_t raw_tar_header; raw_tar_header_t raw_tar_header;
unsigned char *temp = (unsigned char *) &raw_tar_header; unsigned char *temp = (unsigned char *) &raw_tar_header;
long i; long i;
@ -61,7 +54,7 @@ extern int untar(FILE *src_tar_file, int untar_function, char *base_path)
// signal(SIGCHLD, child_died); // signal(SIGCHLD, child_died);
while (fread((char *) &raw_tar_header, 1, 512, src_tar_file)==512) { while (fread((char *) &raw_tar_header, 1, 512, src_tar_file) == 512) {
long sum = 0; long sum = 0;
char *dir; char *dir;
@ -130,30 +123,41 @@ extern int untar(FILE *src_tar_file, int untar_function, char *base_path)
* supposed to be a directory, and fall through * supposed to be a directory, and fall through
*/ */
if (raw_tar_header.name[strlen(raw_tar_header.name)-1] != '/') { if (raw_tar_header.name[strlen(raw_tar_header.name)-1] != '/') {
if (untar_function & untar_extract) { switch (untar_function) {
int out_count=0; case (extract_verbose_extract):
FILE *dst_file; printf("%s\n", raw_tar_header.name);
case (extract_extract): {
dst_file = wfopen(dir, "w"); FILE *dst_file = wfopen(dir, "w");
if (copy_file_chunk(src_tar_file, dst_file, size) == FALSE) { copy_file_chunk(src_tar_file, dst_file, size);
error_msg_and_die("Couldnt extract file"); fclose(dst_file);
} }
uncompressed_count += out_count; break;
fclose(dst_file); default: {
break; int remaining = size;
while (remaining-- > 0) {
fgetc(src_tar_file);
}
}
} }
uncompressed_count += size;
break;
} }
case '5': case '5':
if (untar_function & untar_extract) { switch (untar_function) {
if (create_path(dir, mode) != TRUE) { case (extract_verbose_extract):
free(dir); printf("%s\n", raw_tar_header.name);
perror_msg("%s: Cannot mkdir", raw_tar_header.name); case (extract_extract):
return(EXIT_FAILURE); if (create_path(dir, mode) != TRUE) {
} free(dir);
perror_msg("%s: Cannot mkdir", raw_tar_header.name);
return(EXIT_FAILURE);
}
break;
default:
} }
break; break;
case '1': case '1':
if (untar_function & untar_extract) { if (untar_function & extract_extract) {
if (link(raw_tar_header.linkname, raw_tar_header.name) < 0) { if (link(raw_tar_header.linkname, raw_tar_header.name) < 0) {
free(dir); free(dir);
perror_msg("%s: Cannot create hard link to '%s'", raw_tar_header.name, raw_tar_header.linkname); perror_msg("%s: Cannot create hard link to '%s'", raw_tar_header.name, raw_tar_header.linkname);
@ -162,7 +166,7 @@ extern int untar(FILE *src_tar_file, int untar_function, char *base_path)
} }
break; break;
case '2': case '2':
if (untar_function & untar_extract) { if (untar_function & extract_extract) {
if (symlink(raw_tar_header.linkname, raw_tar_header.name) < 0) { if (symlink(raw_tar_header.linkname, raw_tar_header.name) < 0) {
free(dir); free(dir);
perror_msg("%s: Cannot create symlink to '%s'", raw_tar_header.name, raw_tar_header.linkname); perror_msg("%s: Cannot create symlink to '%s'", raw_tar_header.name, raw_tar_header.linkname);
@ -183,18 +187,5 @@ extern int untar(FILE *src_tar_file, int untar_function, char *base_path)
} }
free(dir); free(dir);
} }
/* skip to start of next header */
while(uncompressed_count < next_header_offset) {
char ch[2];
if (fread(ch, 1, 1, src_tar_file) != 1) {
error_msg("read error\n");
getchar();
} else {
uncompressed_count++;
}
}
/*
* TODO: Check that gunzip child hasnt finished
*/
return(EXIT_SUCCESS); return(EXIT_SUCCESS);
} }