mirrors/tar
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Normalized use of remove_any_file().

Browse Source
This commit is contained in:
Sergey Poznyakoff
2004-09-12 12:50:31 +00:00
parent 6cf99ce8ae
commit 75bf036edc
2 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/extract.c
View File

@@ -462,7 +462,9 @@ prepare_to_extract (char const *file_name)
switch (old_files_option) switch (old_files_option)
{ {
case UNLINK_FIRST_OLD_FILES: 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) && errno && errno != ENOENT)
{ {
unlink_error (file_name); unlink_error (file_name);
@@ -519,7 +521,7 @@ maybe_recoverable (char *file_name, int *interdir_made)
case NO_OVERWRITE_DIR_OLD_FILES: case NO_OVERWRITE_DIR_OLD_FILES:
case OVERWRITE_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; errno = EEXIST;
return r; return r;
} }

3
src/misc.c
View File

@@ -317,7 +317,8 @@ remove_any_file (const char *file_name, enum remove_option option)
entry += entrylen + 1) entry += entrylen + 1)
{ {
char *file_name_buffer = new_name (file_name, entry); char *file_name_buffer = new_name (file_name, entry);
int r = remove_any_file (file_name_buffer, 1); int r = remove_any_file (file_name_buffer,
RECURSIVE_REMOVE_OPTION);
int e = errno; int e = errno;
free (file_name_buffer); free (file_name_buffer);