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

New function, deb-extract to be used by dpkg, code cleanups. saves some bytes

Browse Source
This commit is contained in:
Glenn L McGrath 2001-02-11 03:32:41 +00:00
parent 728875f340
commit bc9afadecd
2 changed files with 174 additions and 172 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

173
archival/dpkg_deb.c
View File

@ -14,6 +14,10 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/ */
/*
* Merge this applet into dpkg when dpkg becomes more stable
*/
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#include <fcntl.h> #include <fcntl.h>
@ -33,31 +37,82 @@ typedef struct ar_headers_s {
struct ar_headers_s *next; struct ar_headers_s *next;
} ar_headers_t; } ar_headers_t;
extern ar_headers_t get_headers(int srcFd); extern ar_headers_t get_ar_headers(int srcFd);
extern int tar_unzip_init(int tarFd); extern int tar_unzip_init(int tarFd);
extern int readTarFile(int tarFd, int extractFlag, int listFlag, extern int readTarFile(int tarFd, int extractFlag, int listFlag,
int tostdoutFlag, int verboseFlag, char** extractList, int tostdoutFlag, int verboseFlag, char** extractList, char** excludeList);
char** excludeList);
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_contents = 1;
const int dpkg_deb_control = 2;
// const int dpkg_deb_info = 4; // const int dpkg_deb_info = 4;
const int dpkg_deb_extract = 8; const int dpkg_deb_extract = 8;
const int dpkg_deb_verbose_extract = 16; const int dpkg_deb_verbose_extract = 16;
int opt=0;
int optflag=0; extern int deb_extract(int optflags, const char *dir_name, const char *deb_filename)
{
char **extract_list = NULL;
ar_headers_t *ar_headers = NULL;
char ar_filename[15];
int extract_flag = FALSE; int extract_flag = FALSE;
int list_flag = FALSE; int list_flag = FALSE;
int verbose_flag = FALSE; int verbose_flag = FALSE;
int extract_to_stdout = FALSE; int extract_to_stdout = FALSE;
char ar_filename[15]; int srcFd = 0;
int srcFd=0; int status;
int status=0;
ar_headers_t *ar_headers = NULL; if (dpkg_deb_contents == (dpkg_deb_contents & optflags)) {
char **extract_list=NULL; strcpy(ar_filename, "data.tar.gz");
char *target_dir=NULL; verbose_flag = TRUE;
list_flag = TRUE;
}
if (dpkg_deb_control == (dpkg_deb_control & optflags)) {
strcpy(ar_filename, "control.tar.gz");
extract_flag = TRUE;
}
if (dpkg_deb_extract == (dpkg_deb_extract & optflags)) {
strcpy(ar_filename, "data.tar.gz");
extract_flag = TRUE;
}
if (dpkg_deb_verbose_extract == (dpkg_deb_verbose_extract & optflags)) {
strcpy(ar_filename, "data.tar.gz");
extract_flag = TRUE;
list_flag = TRUE;
}
ar_headers = (ar_headers_t *) xmalloc(sizeof(ar_headers_t));
srcFd = open(deb_filename, O_RDONLY);
*ar_headers = get_ar_headers(srcFd);
if (ar_headers->next == NULL) {
error_msg_and_die("Couldnt find %s in %s", ar_filename, deb_filename);
}
while (ar_headers->next != NULL) {
if (strcmp(ar_headers->name, ar_filename) == 0) {
break;
}
ar_headers = ar_headers->next;
}
lseek(srcFd, ar_headers->offset, SEEK_SET);
srcFd = tar_unzip_init(srcFd);
if ( dir_name != NULL) {
if (is_directory(dir_name, TRUE, NULL)==FALSE) {
mkdir(dir_name, 0755);
}
if (chdir(dir_name)==-1) {
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);
return status;
}
extern int dpkg_deb_main(int argc, char **argv)
{
char *target_dir = NULL;
int opt = 0;
int optflag = 0;
while ((opt = getopt(argc, argv, "cexX")) != -1) { while ((opt = getopt(argc, argv, "cexX")) != -1) {
switch (opt) { switch (opt) {
@ -67,16 +122,16 @@ extern int dpkg_deb_main(int argc, char **argv)
case 'e': case 'e':
optflag |= dpkg_deb_control; optflag |= dpkg_deb_control;
break; break;
case 'X':
optflag |= dpkg_deb_verbose_extract;
break;
case 'x':
optflag |= dpkg_deb_extract;
break;
/* case 'I': /* case 'I':
optflag |= dpkg_deb_info; optflag |= dpkg_deb_info;
break; break;
*/ */
case 'x':
optflag |= dpkg_deb_extract;
break;
case 'X':
optflag |= dpkg_deb_verbose_extract;
break;
default: default:
usage(dpkg_deb_usage); usage(dpkg_deb_usage);
return EXIT_FAILURE; return EXIT_FAILURE;
@ -87,25 +142,16 @@ extern int dpkg_deb_main(int argc, char **argv)
usage(dpkg_deb_usage); usage(dpkg_deb_usage);
return(EXIT_FAILURE); return(EXIT_FAILURE);
} }
if ((optflag & dpkg_deb_control) || (optflag & dpkg_deb_extract) || (optflag & dpkg_deb_verbose_extract)) {
if (optflag & dpkg_deb_contents) { if ( (optind + 1) == argc ) {
list_flag = TRUE; target_dir = (char *) xmalloc(7);
verbose_flag = TRUE; strcpy(target_dir, "DEBIAN");
strcpy(ar_filename, "data.tar.gz"); } else {
} target_dir = (char *) xmalloc(strlen(argv[optind + 1]));
else if (optflag & dpkg_deb_control) { strcpy(target_dir, argv[optind + 1]);
extract_flag = TRUE; }
strcpy(ar_filename, "control.tar.gz");
if ( (optind + 1) == argc ) {
target_dir = (char *) xmalloc(7);
strcpy(target_dir, "DEBIAN");
}
else {
target_dir = (char *) xmalloc(strlen(argv[optind+1]));
strcpy(target_dir, argv[optind+1]);
}
} }
deb_extract(optflag, target_dir, argv[optind]);
/* else if (optflag & dpkg_deb_info) { /* else if (optflag & dpkg_deb_info) {
extract_flag = TRUE; extract_flag = TRUE;
extract_to_stdout = TRUE; extract_to_stdout = TRUE;
@ -114,50 +160,5 @@ extern int dpkg_deb_main(int argc, char **argv)
printf("list one is [%s]\n",extract_list[0]); printf("list one is [%s]\n",extract_list[0]);
} }
*/ */
else if (optflag & dpkg_deb_extract) {
extract_flag = TRUE;
strcpy(ar_filename, "data.tar.gz");
if ( (optind + 2) > argc ) {
error_msg_and_die("No directory specified");
}
target_dir = (char *) xmalloc(strlen(argv[optind+1]));
strcpy(target_dir, argv[optind+1]);
}
else if (optflag & dpkg_deb_verbose_extract) {
extract_flag = TRUE;
list_flag = TRUE;
strcpy(ar_filename, "data.tar.gz");
if ( (optind + 2) > argc ) {
error_msg_and_die("No directory specified");
}
target_dir = (char *) xmalloc(strlen(argv[optind+1]));
strcpy(target_dir, argv[optind+1]);
}
ar_headers = (ar_headers_t *) xmalloc(sizeof(ar_headers_t));
srcFd = open(argv[optind], O_RDONLY);
*ar_headers = get_headers(srcFd);
if (ar_headers->next==NULL)
error_msg_and_die("Couldnt find %s in %s", ar_filename, argv[optind]);
while (ar_headers->next != NULL) {
if (strcmp(ar_headers->name, ar_filename)==0)
break;
ar_headers = ar_headers->next;
}
lseek(srcFd, ar_headers->offset, SEEK_SET);
srcFd = tar_unzip_init(srcFd);
if ( target_dir != NULL) {
if (is_directory(target_dir, TRUE, NULL)==FALSE) {
mkdir(target_dir, 0755);
}
if (chdir(target_dir)==-1) {
error_msg_and_die("Cannot change to dir %s", argv[optind+1]);
}
}
status = readTarFile(srcFd, extract_flag, list_flag, extract_to_stdout, verbose_flag, NULL, extract_list);
close (srcFd);
return(EXIT_SUCCESS); return(EXIT_SUCCESS);
} }

173
dpkg_deb.c
View File

@ -14,6 +14,10 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/ */
/*
* Merge this applet into dpkg when dpkg becomes more stable
*/
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#include <fcntl.h> #include <fcntl.h>
@ -33,31 +37,82 @@ typedef struct ar_headers_s {
struct ar_headers_s *next; struct ar_headers_s *next;
} ar_headers_t; } ar_headers_t;
extern ar_headers_t get_headers(int srcFd); extern ar_headers_t get_ar_headers(int srcFd);
extern int tar_unzip_init(int tarFd); extern int tar_unzip_init(int tarFd);
extern int readTarFile(int tarFd, int extractFlag, int listFlag, extern int readTarFile(int tarFd, int extractFlag, int listFlag,
int tostdoutFlag, int verboseFlag, char** extractList, int tostdoutFlag, int verboseFlag, char** extractList, char** excludeList);
char** excludeList);
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_contents = 1;
const int dpkg_deb_control = 2;
// const int dpkg_deb_info = 4; // const int dpkg_deb_info = 4;
const int dpkg_deb_extract = 8; const int dpkg_deb_extract = 8;
const int dpkg_deb_verbose_extract = 16; const int dpkg_deb_verbose_extract = 16;
int opt=0;
int optflag=0; extern int deb_extract(int optflags, const char *dir_name, const char *deb_filename)
{
char **extract_list = NULL;
ar_headers_t *ar_headers = NULL;
char ar_filename[15];
int extract_flag = FALSE; int extract_flag = FALSE;
int list_flag = FALSE; int list_flag = FALSE;
int verbose_flag = FALSE; int verbose_flag = FALSE;
int extract_to_stdout = FALSE; int extract_to_stdout = FALSE;
char ar_filename[15]; int srcFd = 0;
int srcFd=0; int status;
int status=0;
ar_headers_t *ar_headers = NULL; if (dpkg_deb_contents == (dpkg_deb_contents & optflags)) {
char **extract_list=NULL; strcpy(ar_filename, "data.tar.gz");
char *target_dir=NULL; verbose_flag = TRUE;
list_flag = TRUE;
}
if (dpkg_deb_control == (dpkg_deb_control & optflags)) {
strcpy(ar_filename, "control.tar.gz");
extract_flag = TRUE;
}
if (dpkg_deb_extract == (dpkg_deb_extract & optflags)) {
strcpy(ar_filename, "data.tar.gz");
extract_flag = TRUE;
}
if (dpkg_deb_verbose_extract == (dpkg_deb_verbose_extract & optflags)) {
strcpy(ar_filename, "data.tar.gz");
extract_flag = TRUE;
list_flag = TRUE;
}
ar_headers = (ar_headers_t *) xmalloc(sizeof(ar_headers_t));
srcFd = open(deb_filename, O_RDONLY);
*ar_headers = get_ar_headers(srcFd);
if (ar_headers->next == NULL) {
error_msg_and_die("Couldnt find %s in %s", ar_filename, deb_filename);
}
while (ar_headers->next != NULL) {
if (strcmp(ar_headers->name, ar_filename) == 0) {
break;
}
ar_headers = ar_headers->next;
}
lseek(srcFd, ar_headers->offset, SEEK_SET);
srcFd = tar_unzip_init(srcFd);
if ( dir_name != NULL) {
if (is_directory(dir_name, TRUE, NULL)==FALSE) {
mkdir(dir_name, 0755);
}
if (chdir(dir_name)==-1) {
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);
return status;
}
extern int dpkg_deb_main(int argc, char **argv)
{
char *target_dir = NULL;
int opt = 0;
int optflag = 0;
while ((opt = getopt(argc, argv, "cexX")) != -1) { while ((opt = getopt(argc, argv, "cexX")) != -1) {
switch (opt) { switch (opt) {
@ -67,16 +122,16 @@ extern int dpkg_deb_main(int argc, char **argv)
case 'e': case 'e':
optflag |= dpkg_deb_control; optflag |= dpkg_deb_control;
break; break;
case 'X':
optflag |= dpkg_deb_verbose_extract;
break;
case 'x':
optflag |= dpkg_deb_extract;
break;
/* case 'I': /* case 'I':
optflag |= dpkg_deb_info; optflag |= dpkg_deb_info;
break; break;
*/ */
case 'x':
optflag |= dpkg_deb_extract;
break;
case 'X':
optflag |= dpkg_deb_verbose_extract;
break;
default: default:
usage(dpkg_deb_usage); usage(dpkg_deb_usage);
return EXIT_FAILURE; return EXIT_FAILURE;
@ -87,25 +142,16 @@ extern int dpkg_deb_main(int argc, char **argv)
usage(dpkg_deb_usage); usage(dpkg_deb_usage);
return(EXIT_FAILURE); return(EXIT_FAILURE);
} }
if ((optflag & dpkg_deb_control) || (optflag & dpkg_deb_extract) || (optflag & dpkg_deb_verbose_extract)) {
if (optflag & dpkg_deb_contents) { if ( (optind + 1) == argc ) {
list_flag = TRUE; target_dir = (char *) xmalloc(7);
verbose_flag = TRUE; strcpy(target_dir, "DEBIAN");
strcpy(ar_filename, "data.tar.gz"); } else {
} target_dir = (char *) xmalloc(strlen(argv[optind + 1]));
else if (optflag & dpkg_deb_control) { strcpy(target_dir, argv[optind + 1]);
extract_flag = TRUE; }
strcpy(ar_filename, "control.tar.gz");
if ( (optind + 1) == argc ) {
target_dir = (char *) xmalloc(7);
strcpy(target_dir, "DEBIAN");
}
else {
target_dir = (char *) xmalloc(strlen(argv[optind+1]));
strcpy(target_dir, argv[optind+1]);
}
} }
deb_extract(optflag, target_dir, argv[optind]);
/* else if (optflag & dpkg_deb_info) { /* else if (optflag & dpkg_deb_info) {
extract_flag = TRUE; extract_flag = TRUE;
extract_to_stdout = TRUE; extract_to_stdout = TRUE;
@ -114,50 +160,5 @@ extern int dpkg_deb_main(int argc, char **argv)
printf("list one is [%s]\n",extract_list[0]); printf("list one is [%s]\n",extract_list[0]);
} }
*/ */
else if (optflag & dpkg_deb_extract) {
extract_flag = TRUE;
strcpy(ar_filename, "data.tar.gz");
if ( (optind + 2) > argc ) {
error_msg_and_die("No directory specified");
}
target_dir = (char *) xmalloc(strlen(argv[optind+1]));
strcpy(target_dir, argv[optind+1]);
}
else if (optflag & dpkg_deb_verbose_extract) {
extract_flag = TRUE;
list_flag = TRUE;
strcpy(ar_filename, "data.tar.gz");
if ( (optind + 2) > argc ) {
error_msg_and_die("No directory specified");
}
target_dir = (char *) xmalloc(strlen(argv[optind+1]));
strcpy(target_dir, argv[optind+1]);
}
ar_headers = (ar_headers_t *) xmalloc(sizeof(ar_headers_t));
srcFd = open(argv[optind], O_RDONLY);
*ar_headers = get_headers(srcFd);
if (ar_headers->next==NULL)
error_msg_and_die("Couldnt find %s in %s", ar_filename, argv[optind]);
while (ar_headers->next != NULL) {
if (strcmp(ar_headers->name, ar_filename)==0)
break;
ar_headers = ar_headers->next;
}
lseek(srcFd, ar_headers->offset, SEEK_SET);
srcFd = tar_unzip_init(srcFd);
if ( target_dir != NULL) {
if (is_directory(target_dir, TRUE, NULL)==FALSE) {
mkdir(target_dir, 0755);
}
if (chdir(target_dir)==-1) {
error_msg_and_die("Cannot change to dir %s", argv[optind+1]);
}
}
status = readTarFile(srcFd, extract_flag, list_flag, extract_to_stdout, verbose_flag, NULL, extract_list);
close (srcFd);
return(EXIT_SUCCESS); return(EXIT_SUCCESS);
} }