Normalized use of remove_any_file().

[chaz/tar] / src / extract.c

diff --git a/src/extract.c b/src/extract.c
index 14ea3ad0208e2a58a1c155af139e7099eee8b6ec..f348b822ed6620c2dcdd3854cdd460e9dc1166eb 100644 (file)
--- a/src/extract.c
+++ b/src/extract.c
@@ -19,7 +19,7 @@
    with this program; if not, write to the Free Software Foundation, Inc.,
    59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 
-#include "system.h"
+#include <system.h>
 #include <quotearg.h>
 #include <errno.h>
 #include <xgetcwd.h>
@@ -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;
          }