emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix tar-handles-nested-exclude testcase

Browse Source
This commit is contained in:
Glenn L McGrath 2003-11-20 10:47:06 +00:00
parent d9c8ab40a4
commit e857122c97
2 changed files with 13 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
archival/libunarchive/get_header_tar.c
View File

@ -106,6 +106,14 @@ extern char get_header_tar(archive_handle_t *archive_handle)
file_header->name = concat_path_file(tar.formated.prefix, tar.formated.name); file_header->name = concat_path_file(tar.formated.prefix, tar.formated.name);
} }
{ /* Strip trailing '/' in directories */
char *tmp = last_char_is(file_header->name, '/');
if (tmp) {
*tmp = '\0';
}
}
file_header->mode = strtol(tar.formated.mode, NULL, 8); file_header->mode = strtol(tar.formated.mode, NULL, 8);
file_header->uid = strtol(tar.formated.uid, NULL, 8); file_header->uid = strtol(tar.formated.uid, NULL, 8);
file_header->gid = strtol(tar.formated.gid, NULL, 8); file_header->gid = strtol(tar.formated.gid, NULL, 8);

5
archival/tar.c
View File

@ -731,6 +731,11 @@ int tar_main(int argc, char **argv)
/* Setup an array of filenames to work with */ /* Setup an array of filenames to work with */
/* TODO: This is the same as in ar, seperate function ? */ /* TODO: This is the same as in ar, seperate function ? */
while (optind < argc) { while (optind < argc) {
char *filename_ptr;
filename_ptr = last_char_is(argv[optind], '/');
if (filename_ptr) {
*filename_ptr = '\0';
}
tar_handle->accept = llist_add_to(tar_handle->accept, argv[optind]); tar_handle->accept = llist_add_to(tar_handle->accept, argv[optind]);
optind++; optind++;
} }