X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=src%2Fextract.c;h=f348b822ed6620c2dcdd3854cdd460e9dc1166eb;hb=63c140752fa4535856e47af8d4602fa870f55a81;hp=214d975e5b3e84b79266a13287e6384321d4dd73;hpb=7347b4f5d51c15bb19637ea52e9bf7dff832cc52;p=chaz%2Ftar diff --git a/src/extract.c b/src/extract.c index 214d975..f348b82 100644 --- a/src/extract.c +++ b/src/extract.c @@ -462,7 +462,9 @@ prepare_to_extract (char const *file_name) switch (old_files_option) { case UNLINK_FIRST_OLD_FILES: - if (!remove_any_file (file_name, recursive_unlink_option) + if (!remove_any_file (file_name, + recursive_unlink_option ? RECURSIVE_REMOVE_OPTION + : ORDINARY_REMOVE_OPTION) && errno && errno != ENOENT) { unlink_error (file_name); @@ -519,7 +521,7 @@ maybe_recoverable (char *file_name, int *interdir_made) case NO_OVERWRITE_DIR_OLD_FILES: case OVERWRITE_OLD_FILES: { - int r = remove_any_file (file_name, 0); + int r = remove_any_file (file_name, ORDINARY_REMOVE_OPTION); errno = EEXIST; return r; }