#include <string.h>
#include <unistd.h>
#include <utime.h>
+#include <libgen.h>
+
#include "libbb.h"
#define CONFIG_FEATURE_TAR_OLDGNU_COMPATABILITY 1
static char *linkname = NULL;
#endif
-extern void seek_sub_file(FILE *src_stream, const int count);
-extern char *extract_archive(FILE *src_stream, FILE *out_stream, const file_header_t *file_entry,
- const int function, const char *prefix);
-extern ssize_t seek_by_read(FILE* fd, size_t len);
-
-
-#ifdef L_archive_offset
off_t archive_offset;
-#else
-extern off_t archive_offset;
-#endif
-#ifdef L_seek_sub_file
#define SEEK_BUF 4096
-ssize_t seek_by_read(FILE* fd, size_t len)
+static ssize_t
+seek_by_read(FILE* fd, size_t len)
{
ssize_t cc, total = 0;
char buf[SEEK_BUF];
return total;
}
-void seek_sub_file(FILE *src_stream, const int count)
+static void
+seek_sub_file(FILE *src_stream, const int count)
{
/* Try to fseek as faster */
archive_offset += count;
seek_by_read(src_stream, count);
return;
}
-#endif
-
-#ifdef L_extract_archive
/* Extract the data postioned at src_stream to either filesystem, stdout or
* buffer depending on the value of 'function' which is defined in libbb.h
*
* For this reason if prefix does point to a dir then it must end with a
* trailing '/' or else the last dir will be assumed to be the file prefix
*/
-char *extract_archive(FILE *src_stream, FILE *out_stream, const file_header_t *file_entry,
- const int function, const char *prefix)
+static char *
+extract_archive(FILE *src_stream, FILE *out_stream,
+ const file_header_t *file_entry, const int function,
+ const char *prefix)
{
FILE *dst_stream = NULL;
char *full_name = NULL;
strcat(full_link_name, file_entry->link_name);
}
} else {
- full_name = strdup(file_entry->name);
+ full_name = xstrdup(file_entry->name);
if ( file_entry->link_name )
- full_link_name = strdup(file_entry->link_name);
+ full_link_name = xstrdup(file_entry->link_name);
}
- if (function & extract_to_stdout) {
+ if (function & extract_to_stream) {
if (S_ISREG(file_entry->mode)) {
copy_file_chunk(src_stream, out_stream, file_entry->size);
archive_offset += file_entry->size;
return(buffer); /* Maybe we should say if failed */
}
-#endif
-#ifdef L_unarchive
-char *unarchive(FILE *src_stream, FILE *out_stream,
+static char *
+unarchive(FILE *src_stream, FILE *out_stream,
file_header_t *(*get_headers)(FILE *),
void (*free_headers)(file_header_t *),
- const int extract_function, const char *prefix, char **extract_names)
+ const int extract_function,
+ const char *prefix,
+ const char **extract_names)
{
file_header_t *file_entry;
int extract_flag;
return(buffer);
}
-#endif
-#ifdef L_get_header_ar
-file_header_t *get_header_ar(FILE *src_stream)
+static file_header_t *
+get_header_ar(FILE *src_stream)
{
file_header_t *typed;
union {
return(typed);
}
-void free_header_ar(file_header_t *ar_entry)
+static void
+free_header_ar(file_header_t *ar_entry)
{
- if (ar_entry == NULL) {
- return;
- }
+ if (ar_entry == NULL)
+ return;
- free(ar_entry->name);
- free(ar_entry->link_name);
+ free(ar_entry->name);
+ if (ar_entry->link_name)
+ free(ar_entry->link_name);
- free(ar_entry);
+ free(ar_entry);
}
-#endif
-
-#ifdef L_get_header_cpio
-struct hardlinks {
- file_header_t *entry;
- int inode;
- struct hardlinks *next;
-};
-
-file_header_t *get_header_cpio(FILE *src_stream)
-{
- file_header_t *cpio_entry = NULL;
- char cpio_header[110];
- int namesize;
- char dummy[16];
- int major, minor, nlink, inode;
- static struct hardlinks *saved_hardlinks = NULL;
- static int pending_hardlinks = 0;
-
-
- if (pending_hardlinks) { /* Deal with any pending hardlinks */
- struct hardlinks *tmp = saved_hardlinks, *oldtmp = NULL;
- while (tmp) {
- if (tmp->entry->link_name) { /* Found a hardlink ready to be extracted */
- cpio_entry = tmp->entry;
- if (oldtmp) oldtmp->next = tmp->next; /* Remove item from linked list */
- else saved_hardlinks = tmp->next;
- free(tmp);
- return (cpio_entry);
- }
- oldtmp = tmp;
- tmp = tmp->next;
- }
- pending_hardlinks = 0; /* No more pending hardlinks, read next file entry */
- }
-
- /* There can be padding before archive header */
- seek_sub_file(src_stream, (4 - (archive_offset % 4)) % 4);
- if (fread(cpio_header, 1, 110, src_stream) == 110) {
- archive_offset += 110;
- if (strncmp(cpio_header, "07070", 5) != 0) {
- error_msg("Unsupported format or invalid magic");
- return(NULL);
- }
- switch (cpio_header[5]) {
- case '2': /* "crc" header format */
- /* Doesnt do the crc check yet */
- case '1': /* "newc" header format */
- cpio_entry = (file_header_t *) xcalloc(1, sizeof(file_header_t));
- sscanf(cpio_header, "%6c%8x%8x%8x%8x%8x%8lx%8lx%16c%8x%8x%8x%8c",
- dummy, &inode, (unsigned int*)&cpio_entry->mode,
- (unsigned int*)&cpio_entry->uid, (unsigned int*)&cpio_entry->gid,
- &nlink, &cpio_entry->mtime, (unsigned long*)&cpio_entry->size,
- dummy, &major, &minor, &namesize, dummy);
-
- cpio_entry->name = (char *) xcalloc(1, namesize);
- fread(cpio_entry->name, 1, namesize, src_stream); /* Read in filename */
- archive_offset += namesize;
- /* Skip padding before file contents */
- seek_sub_file(src_stream, (4 - (archive_offset % 4)) % 4);
- if (strcmp(cpio_entry->name, "TRAILER!!!") == 0) {
- printf("%d blocks\n", (int) (archive_offset % 512 ? (archive_offset / 512) + 1 : archive_offset / 512)); /* Always round up */
- if (saved_hardlinks) { /* Bummer - we still have unresolved hardlinks */
- struct hardlinks *tmp = saved_hardlinks, *oldtmp = NULL;
- while (tmp) {
- error_msg("%s not created: cannot resolve hardlink", tmp->entry->name);
- oldtmp = tmp;
- tmp = tmp->next;
- free (oldtmp->entry->name);
- free (oldtmp->entry);
- free (oldtmp);
- }
- saved_hardlinks = NULL;
- pending_hardlinks = 0;
- }
- return(NULL);
- }
- if (S_ISLNK(cpio_entry->mode)) {
- cpio_entry->link_name = (char *) xcalloc(1, cpio_entry->size + 1);
- fread(cpio_entry->link_name, 1, cpio_entry->size, src_stream);
- archive_offset += cpio_entry->size;
- cpio_entry->size = 0; /* Stop possiable seeks in future */
- }
- if (nlink > 1 && !S_ISDIR(cpio_entry->mode)) {
- if (cpio_entry->size == 0) { /* Put file on a linked list for later */
- struct hardlinks *new = xmalloc(sizeof(struct hardlinks));
- new->next = saved_hardlinks;
- new->inode = inode;
- new->entry = cpio_entry;
- saved_hardlinks = new;
- return(get_header_cpio(src_stream)); /* Recurse to next file */
- } else { /* Found the file with data in */
- struct hardlinks *tmp = saved_hardlinks;
- pending_hardlinks = 1;
- while (tmp) {
- if (tmp->inode == inode) {
- tmp->entry->link_name = xstrdup(cpio_entry->name);
- nlink--;
- }
- tmp = tmp->next;
- }
- if (nlink > 1) error_msg("error resolving hardlink: did you create the archive with GNU cpio 2.0-2.2?");
- }
- }
- cpio_entry->device = (major << 8) | minor;
- break;
- default:
- error_msg("Unsupported format");
- return(NULL);
- }
- if (ferror(src_stream) || feof(src_stream)) {
- perror_msg("Stream error");
- return(NULL);
- }
- }
- return(cpio_entry);
-}
-#endif
-#ifdef L_get_header_tar
-file_header_t *get_header_tar(FILE *tar_stream)
+static file_header_t *
+get_header_tar(FILE *tar_stream)
{
-
union {
unsigned char raw[512];
struct {
return(tar_entry);
}
-void free_header_tar(file_header_t *tar_entry)
+static void
+free_header_tar(file_header_t *tar_entry)
{
- if (tar_entry == NULL) {
- return;
- }
+ if (tar_entry == NULL)
+ return;
- free(tar_entry->name);
- free(tar_entry->link_name);
+ free(tar_entry->name);
+ if (tar_entry->link_name);
+ free(tar_entry->link_name);
- free(tar_entry);
+ free(tar_entry);
}
-#endif
-
-#ifdef L_deb_extract
-char *deb_extract(const char *package_filename, FILE *out_stream,
+char *
+deb_extract(const char *package_filename, FILE *out_stream,
const int extract_function, const char *prefix, const char *filename)
{
- FILE *deb_stream;
- FILE *uncompressed_stream = NULL;
+ FILE *deb_stream = NULL;
file_header_t *ar_header = NULL;
- char **file_list = NULL;
+ const char **file_list = NULL;
char *output_buffer = NULL;
char *ared_file = NULL;
char ar_magic[8];
- int gunzip_pid = 0;
if (filename != NULL) {
file_list = xmalloc(sizeof(char *) * 2);
- file_list[0] = xstrdup(filename);
+ file_list[0] = filename;
file_list[1] = NULL;
}
if (extract_function & extract_control_tar_gz) {
- ared_file = xstrdup("control.tar.gz");
+ ared_file = "control.tar.gz";
}
else if (extract_function & extract_data_tar_gz) {
- ared_file = xstrdup("data.tar.gz");
+ ared_file = "data.tar.gz";
} else {
fprintf(stderr, "no file specified to extract -- extract_function=%x\n", extract_function);
goto cleanup;
while ((ar_header = get_header_ar(deb_stream)) != NULL) {
if (strcmp(ared_file, ar_header->name) == 0) {
+ int gunzip_pid = 0;
+ FILE *uncompressed_stream;
/* open a stream of decompressed data */
uncompressed_stream = gz_open(deb_stream, &gunzip_pid);
if (uncompressed_stream == NULL) {
archive_offset = 0;
output_buffer = unarchive(uncompressed_stream, out_stream, get_header_tar, free_header_tar, extract_function, prefix, file_list);
+ fclose(uncompressed_stream);
+ gz_close(gunzip_pid);
+ free_header_ar(ar_header);
+ break;
}
seek_sub_file(deb_stream, ar_header->size);
- free (ar_header->name);
- free (ar_header);
+ free_header_ar(ar_header);
}
- gz_close(gunzip_pid);
- fclose(deb_stream);
- fclose(uncompressed_stream);
- free(ared_file);
goto cleanup;
} else if (strncmp(ar_magic, "\037\213", 2) == 0) {
/* it's a gz file, let's assume it's an opkg */
if (strncmp(tar_header->name, "./", 2) == 0)
name_offset = 2;
if (strcmp(ared_file, tar_header->name+name_offset) == 0) {
+ int gunzip_pid = 0;
+ FILE *uncompressed_stream;
/* open a stream of decompressed data */
uncompressed_stream = gz_open(unzipped_opkg_stream, &gunzip_pid);
if (uncompressed_stream == NULL) {
file_list);
/*fprintf(stderr, __FUNCTION__ ":%d: unarchive complete\n", __LINE__);*/
free_header_tar(tar_header);
- gz_close(gunzip_pid);
fclose(uncompressed_stream);
+ gz_close(gunzip_pid);
+ free_header_tar(tar_header);
break;
}
seek_sub_file(unzipped_opkg_stream, tar_header->size);
free_header_tar(tar_header);
}
- gz_close(unzipped_opkg_pid);
fclose(unzipped_opkg_stream);
- fclose(deb_stream);
- free(ared_file);
+ gz_close(unzipped_opkg_pid);
/*fprintf(stderr, __FUNCTION__ ":%d: done\n", __LINE__);*/
goto cleanup;
} else {
}
cleanup:
- if (file_list) {
- free(file_list[0]);
+ if (deb_stream)
+ fclose(deb_stream);
+ if (file_list)
free(file_list);
- }
return output_buffer;
}
-#endif