X-Git-Url: https://git.brokenzipper.com/gitweb?a=blobdiff_plain;f=src%2Fextract.c;h=d391e3e3372c0340b58e398203f2b5e6197ce5fe;hb=cc82db7f2d7768afab6d789c0e78ce1f07722d0d;hp=0ff01a998bc7df954817dd52cd1b72835f94a90d;hpb=796a69787e5f3fc51436dcf88d1c50ab6f726203;p=chaz%2Ftar diff --git a/src/extract.c b/src/extract.c index 0ff01a9..d391e3e 100644 --- a/src/extract.c +++ b/src/extract.c @@ -871,7 +871,7 @@ create_placeholder_file (char *file_name, bool is_symlink, int *interdir_made) if (h && ! h->after_links && strncmp (file_name, h->file_name, h->file_name_len) == 0 && ISSLASH (file_name[h->file_name_len]) - && (base_name (file_name) == file_name + h->file_name_len + 1)) + && (last_component (file_name) == file_name + h->file_name_len + 1)) { do { @@ -1023,13 +1023,6 @@ extract_fifo (char *file_name, int typeflag) } #endif -static int -extract_mangle_wrapper (char *file_name, int typeflag) -{ - extract_mangle (); - return 0; -} - static int extract_volhdr (char *file_name, int typeflag) { @@ -1121,10 +1114,6 @@ prepare_to_extract (char const *file_name, int typeflag, tar_extractor_t *fun) *fun = extract_volhdr; break; - case GNUTYPE_NAMES: - *fun = extract_mangle_wrapper; - break; - case GNUTYPE_MULTIVOL: ERROR ((0, 0, _("%s: Cannot extract -- file is continued from another volume"), @@ -1331,10 +1320,10 @@ rename_directory (char *src, char *dst) e = errno; } break; - + case EXDEV: /* FIXME: Fall back to recursive copying */ - + default: break; } @@ -1346,7 +1335,7 @@ rename_directory (char *src, char *dst) } return true; } - + void fatal_exit (void) {