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
#endif
#ifdef L_seek_sub_file
+#define SEEK_BUF 4096
+ssize_t seek_by_read(FILE* fd, size_t len)
+{
+ ssize_t cc, total = 0;
+ char buf[SEEK_BUF];
+
+ while (len) {
+ cc = fread(buf, sizeof(buf[0]),
+ len > SEEK_BUF ? SEEK_BUF : len,
+ fd);
+
+ total += cc;
+ len -= cc;
+
+ if(feof(fd) || ferror(fd))
+ break;
+ }
+ return total;
+}
+
void seek_sub_file(FILE *src_stream, const int count)
{
- int i;
/* Try to fseek as faster */
archive_offset += count;
- if (fseek(src_stream, count, SEEK_CUR) != 0 && errno == ESPIPE) {
- for (i = 0; i < count; i++) {
- fgetc(src_stream);
- }
- }
+ seek_by_read(src_stream, count);
return;
}
#endif
fread(buffer, 1, file_entry->size, src_stream);
buffer[file_entry->size] = '\0';
archive_offset += file_entry->size;
- return(buffer);
+ goto cleanup;
}
}
else if (function & extract_all_to_fs) {
error_msg("%s not created: newer or same age file exists", file_entry->name);
}
seek_sub_file(src_stream, file_entry->size);
- return (NULL);
+ goto cleanup;
}
}
if (function & extract_create_leading_dirs) { /* Create leading directories with default umask */
} else {
if ((dst_stream = wfopen(full_name, "w")) == NULL) {
seek_sub_file(src_stream, file_entry->size);
- return NULL;
+ goto cleanup;
}
archive_offset += file_entry->size;
copy_file_chunk(src_stream, dst_stream, file_entry->size);
if ((function & extract_quiet) != extract_quiet) {
perror_msg("Cannot create symlink from %s to '%s'", file_entry->name, file_entry->link_name);
}
- return NULL;
+ goto cleanup;
}
break;
case S_IFSOCK:
if ((function & extract_quiet) != extract_quiet) {
perror_msg("Cannot create node %s", file_entry->name);
}
- return NULL;
+ goto cleanup;
}
break;
default:
fprintf(out_stream, "%s\n", file_entry->name);
}
+cleanup:
free(full_name);
if ( full_link_name )
free(full_link_name);
- return(NULL); /* Maybe we should say if failed */
+ return(buffer); /* Maybe we should say if failed */
}
#endif
linkname = NULL;
} else
#endif
- if (tar.formated.prefix[0] == 0) {
- tar_entry->name = strdup(tar.formated.name);
- } else {
- tar_entry->name = concat_path_file(tar.formated.prefix, tar.formated.name);
+ {
+ tar_entry->name = xstrndup(tar.formated.name, 100);
+
+ if (tar.formated.prefix[0]) {
+ char *temp = tar_entry->name;
+ char *prefixTemp = xstrndup(tar.formated.prefix, 155);
+ tar_entry->name = concat_path_file(prefixTemp, temp);
+ free(temp);
+ free(prefixTemp);
+ }
}
// tar_entry->name = xstrdup(tar.formated.name);
tar_entry->gid = strtol(tar.formated.gid, NULL, 8);
tar_entry->size = strtol(tar.formated.size, NULL, 8);
tar_entry->mtime = strtol(tar.formated.mtime, NULL, 8);
- tar_entry->link_name = strlen(tar.formated.linkname) ?
- xstrdup(tar.formated.linkname) : NULL;
+ tar_entry->link_name = *tar.formated.linkname != '\0' ? xstrndup(tar.formated.linkname, 100) : NULL;
tar_entry->device = (strtol(tar.formated.devmajor, NULL, 8) << 8) +
strtol(tar.formated.devminor, NULL, 8);
char *deb_extract(const char *package_filename, FILE *out_stream,
const int extract_function, const char *prefix, const char *filename)
{
- FILE *deb_stream;
+ FILE *deb_stream = NULL;
FILE *uncompressed_stream = NULL;
file_header_t *ar_header = NULL;
char **file_list = NULL;
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);
- return NULL;
+ goto cleanup;
}
/* open the debian package to be worked on */
deb_stream = wfopen(package_filename, "r");
if (deb_stream == NULL) {
- return(NULL);
+ goto cleanup;
}
/* set the buffer size */
setvbuf(deb_stream, NULL, _IOFBF, 0x8000);
while ((ar_header = get_header_ar(deb_stream)) != NULL) {
if (strcmp(ared_file, ar_header->name) == 0) {
/* open a stream of decompressed data */
- uncompressed_stream = gzvopen(deb_stream, &gunzip_pid);
+ uncompressed_stream = gz_open(deb_stream, &gunzip_pid);
+ if (uncompressed_stream == NULL) {
+ goto cleanup;
+ }
+
archive_offset = 0;
output_buffer = unarchive(uncompressed_stream, out_stream, get_header_tar, free_header_tar, extract_function, prefix, file_list);
}
free (ar_header->name);
free (ar_header);
}
- gzvclose(gunzip_pid);
- fclose(deb_stream);
+ gz_close(gunzip_pid);
fclose(uncompressed_stream);
- free(ared_file);
- return(output_buffer);
+ goto cleanup;
} else if (strncmp(ar_magic, "\037\213", 2) == 0) {
/* it's a gz file, let's assume it's an opkg */
int unzipped_opkg_pid;
file_header_t *tar_header;
archive_offset = 0;
fseek(deb_stream, 0, SEEK_SET);
- unzipped_opkg_stream = gzvopen(deb_stream, &unzipped_opkg_pid);
+ unzipped_opkg_stream = gz_open(deb_stream, &unzipped_opkg_pid);
+ if (unzipped_opkg_stream == NULL) {
+ goto cleanup;
+ }
/*fprintf(stderr, __FUNCTION__ ": processing opkg %s -- ared_file=%s\n", package_filename, ared_file);*/
/* walk through outer tar file to find ared_file */
name_offset = 2;
if (strcmp(ared_file, tar_header->name+name_offset) == 0) {
/* open a stream of decompressed data */
- uncompressed_stream = gzvopen(unzipped_opkg_stream, &gunzip_pid);
+ uncompressed_stream = gz_open(unzipped_opkg_stream, &gunzip_pid);
+ if (uncompressed_stream == NULL) {
+ goto cleanup;
+ }
archive_offset = 0;
/*fprintf(stderr, __FUNCTION__ ":%d: here -- found file\n", __LINE__);*/
output_buffer = unarchive(uncompressed_stream,
file_list);
/*fprintf(stderr, __FUNCTION__ ":%d: unarchive complete\n", __LINE__);*/
free_header_tar(tar_header);
- gzvclose(gunzip_pid);
+ gz_close(gunzip_pid);
fclose(uncompressed_stream);
break;
}
seek_sub_file(unzipped_opkg_stream, tar_header->size);
free_header_tar(tar_header);
}
- gzvclose(unzipped_opkg_pid);
+ gz_close(unzipped_opkg_pid);
fclose(unzipped_opkg_stream);
- fclose(deb_stream);
- free(ared_file);
/*fprintf(stderr, __FUNCTION__ ":%d: done\n", __LINE__);*/
- return output_buffer;
+ goto cleanup;
} else {
error_msg_and_die("invalid magic");
}
+cleanup:
+ if (deb_stream)
+ fclose(deb_stream);
+ if (file_list)
+ free(file_list);
+
+ return output_buffer;
}
#endif
projects / oweals / opkg-lede.git / blobdiff