Apple-2gs-SW/hush
1
0
Fork 0
mirror of https://github.com/sheumann/hush.git synced 2024-12-22 14:30:31 +00:00
Code Issues Projects Releases Wiki Activity

Updates, fixes for handling contents, verbose extract.

Browse Source 
More updates to come
This commit is contained in:
Glenn L McGrath 2001-04-12 16:40:21 +00:00
parent 47fd219c95
commit 5a65413c04
1 changed files with 15 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
libbb/untar.c
View File

@ -57,6 +57,7 @@ extern int untar(FILE *src_tar_file, int untar_function, char *base_path)
char *dir = NULL; char *dir = NULL;
if (ferror(src_tar_file) || feof(src_tar_file)) { if (ferror(src_tar_file) || feof(src_tar_file)) {
perror_msg("untar: ");
break; break;
} }
@ -100,7 +101,6 @@ extern int untar(FILE *src_tar_file, int untar_function, char *base_path)
if (size % 512 != 0) { if (size % 512 != 0) {
next_header_offset += (512 - size % 512); next_header_offset += (512 - size % 512);
} }
/* /*
* seek to start of control file, return length * seek to start of control file, return length
* *
@ -139,25 +139,24 @@ 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] != '/') {
switch (untar_function) { if (untar_function & (extract_extract | extract_verbose_extract | extract_control)) {
case (extract_extract): { FILE *dst_file = wfopen(dir, "w");
FILE *dst_file = wfopen(dir, "w"); copy_file_chunk(src_tar_file, dst_file, (unsigned long long) size);
copy_file_chunk(src_tar_file, dst_file, size); uncompressed_count += size;
fclose(dst_file); fclose(dst_file);
} }
while (uncompressed_count < next_header_offset) {
if (fgetc(src_tar_file) == EOF) {
perror_msg("untar");
break; break;
default: { }
int remaining = size; uncompressed_count++;
while (remaining-- > 0) {
fgetc(src_tar_file);
}
}
} }
uncompressed_count += size; uncompressed_count += size;
break; break;
} }
case '5': case '5':
if (untar_function & extract_extract) { if (untar_function & (extract_extract | extract_verbose_extract | extract_control)) {
if (create_path(dir, mode) != TRUE) { if (create_path(dir, mode) != TRUE) {
free(dir); free(dir);
perror_msg("%s: Cannot mkdir", raw_tar_header.name); perror_msg("%s: Cannot mkdir", raw_tar_header.name);
@ -166,7 +165,7 @@ extern int untar(FILE *src_tar_file, int untar_function, char *base_path)
} }
break; break;
case '1': case '1':
if (untar_function & extract_extract) { if (untar_function & (extract_extract | extract_verbose_extract | extract_control)) {
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);
@ -175,7 +174,7 @@ extern int untar(FILE *src_tar_file, int untar_function, char *base_path)
} }
break; break;
case '2': case '2':
if (untar_function & extract_extract) { if (untar_function & (extract_extract | extract_verbose_extract | extract_control)) {
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);