e857122c9
Glenn L McGrath
2003-11-20
Subject
Fix tar-handles-nested-exclude testcase
Binary
No binary (build failed)
Architecture & Compiler Flags
—
Build Log
(log yok)
Commit Diff GitHub →
archival/libunarchive/get_header_tar.c+8 -0
| @@ -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); | |
| } | |
| + | { /* 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->uid = strtol(tar.formated.uid, NULL, 8); | |
| file_header->gid = strtol(tar.formated.gid, NULL, 8); | |
archival/tar.c+5 -0
| @@ -731,6 +731,11 @@ int tar_main(int argc, char **argv) | |
| /* Setup an array of filenames to work with */ | |
| /* TODO: This is the same as in ar, seperate function ? */ | |
| 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]); | |
| optind++; | |
| } | |