aboutsummaryrefslogtreecommitdiff
path: root/archival
diff options
context:
space:
mode:
authorGlenn L McGrath <bug1@ihug.co.nz>2001-04-11 01:37:03 +0000
committerGlenn L McGrath <bug1@ihug.co.nz>2001-04-11 01:37:03 +0000
commit9d53c8ab74ecb2be62ebf4c61350b842787cc6b9 (patch)
treec351bc7377b948c358f0f9c7da1f225b6f349ee3 /archival
parent93ffa950bfd349c8d8ff40f1f862f2b7483584d4 (diff)
downloadbusybox-9d53c8ab74ecb2be62ebf4c61350b842787cc6b9.tar.gz
Move get_ar_headers to libbb, make dpkg_deb.c independent of ar.c
Diffstat (limited to 'archival')
-rw-r--r--archival/ar.c102
-rw-r--r--archival/dpkg_deb.c12
2 files changed, 0 insertions, 114 deletions
diff --git a/archival/ar.c b/archival/ar.c
index 89c43b43d..fbbc7aa64 100644
--- a/archival/ar.c
+++ b/archival/ar.c
@@ -23,113 +23,11 @@
*
*/
#include <fcntl.h>
-#include <string.h>
#include <stdlib.h>
#include <getopt.h>
#include <unistd.h>
#include "busybox.h"
-typedef struct ar_headers_s {
- char *name;
- off_t size;
- uid_t uid;
- gid_t gid;
- mode_t mode;
- time_t mtime;
- off_t offset;
- struct ar_headers_s *next;
-} ar_headers_t;
-
-/*
- * return the headerL_t struct for the filename descriptor
- */
-extern ar_headers_t get_ar_headers(int srcFd)
-{
- typedef struct raw_ar_header_s { /* Byte Offset */
- char name[16]; /* 0-15 */
- char date[12]; /* 16-27 */
- char uid[6];
- char gid[6]; /* 28-39 */
- char mode[8]; /* 40-47 */
- char size[10]; /* 48-57 */
- char fmag[2]; /* 58-59 */
- } raw_ar_header_t;
-
- raw_ar_header_t raw_ar_header;
-
- ar_headers_t *head, *entry;
- char ar_magic[8];
- char *long_name=NULL;
-
- head = (ar_headers_t *) xmalloc(sizeof(ar_headers_t));
- entry = (ar_headers_t *) xmalloc(sizeof(ar_headers_t));
-
- /* check ar magic */
- if (full_read(srcFd, ar_magic, 8) != 8) {
- error_msg_and_die("cannot read magic");
- }
-
- if (strncmp(ar_magic,"!<arch>",7) != 0) {
- error_msg_and_die("invalid magic");
- }
-
- while (full_read(srcFd, (char *) &raw_ar_header, 60)==60) {
- /* check the end of header markers are valid */
- if ((raw_ar_header.fmag[0]!='`') || (raw_ar_header.fmag[1]!='\n')) {
- char newline;
- if (raw_ar_header.fmag[1]!='`') {
- break;
- }
- /* some version of ar, have an extra '\n' after each entry */
- read(srcFd, &newline, 1);
- if (newline!='\n') {
- break;
- }
- /* fix up the header, we started reading 1 byte too early due to a '\n' */
- memmove((char *) &raw_ar_header, (char *)&raw_ar_header+1, 59);
- /* dont worry about adding the last '\n', we dont need it now */
- }
-
- entry->size = (off_t) atoi(raw_ar_header.size);
- /* long filenames have '/' as the first character */
- if (raw_ar_header.name[0] == '/') {
- if (raw_ar_header.name[1] == '/') {
- /* multiple long filenames are stored as data in one entry */
- long_name = (char *) xrealloc(long_name, entry->size);
- full_read(srcFd, long_name, entry->size);
- continue;
- }
- else {
- /* The number after the '/' indicates the offset in the ar data section
- (saved in variable long_name) that conatains the real filename */
- const int long_name_offset = (int) atoi((char *) &raw_ar_header.name[1]);
- entry->name = xmalloc(strlen(&long_name[long_name_offset]));
- strcpy(entry->name, &long_name[long_name_offset]);
- }
- }
- else {
- /* short filenames */
- entry->name = xmalloc(16);
- strncpy(entry->name, raw_ar_header.name, 16);
- }
- entry->name[strcspn(entry->name, " /")]='\0';
-
- /* convert the rest of the now valid char header to its typed struct */
- parse_mode(raw_ar_header.mode, &entry->mode);
- entry->mtime = atoi(raw_ar_header.date);
- entry->uid = atoi(raw_ar_header.uid);
- entry->gid = atoi(raw_ar_header.gid);
- entry->offset = lseek(srcFd, 0, SEEK_CUR);
-
- /* add this entries header to our combined list */
- entry->next = (ar_headers_t *) xmalloc(sizeof(ar_headers_t));
- *entry->next = *head;
- *head = *entry;
- lseek(srcFd, (off_t) entry->size, SEEK_CUR);
- }
- return(*head);
-}
-
extern int ar_main(int argc, char **argv)
{
const int preserve_date = 1; /* preserve original dates */
diff --git a/archival/dpkg_deb.c b/archival/dpkg_deb.c
index 8239c3c43..9f78e642c 100644
--- a/archival/dpkg_deb.c
+++ b/archival/dpkg_deb.c
@@ -31,18 +31,6 @@
extern int gz_open(FILE *compressed_file, int *pid);
extern void gz_close(int gunzip_pid);
-typedef struct ar_headers_s {
- char *name;
- size_t size;
- uid_t uid;
- gid_t gid;
- mode_t mode;
- time_t mtime;
- off_t offset;
- struct ar_headers_s *next;
-} ar_headers_t;
-
-extern ar_headers_t get_ar_headers(int srcFd);
extern int tar_unzip_init(int tarFd);
extern int readTarFile(int tarFd, int extractFlag, int listFlag,
int tostdoutFlag, int verboseFlag, char** extractList, char** excludeList);