mirrors/tar
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/tar.git synced 2026-05-31 20:26:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

(is_regular_file): Don't succeed on files that we can't access due to

Browse Source 
permissions problems.
(open_archive): Fix wording on fatal error message.
Don't bother to stat /dev/null if the archive is not a character
special device.
This commit is contained in:
Paul Eggert
1999-07-12 13:03:58 +00:00
parent 6a8c91fef3
commit de1db1ed96
1 changed files with 7 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/buffer.c
View File

@@ -307,13 +307,10 @@ is_regular_file (const char *name)
{
struct stat stbuf;
if (stat (name, &stbuf) < 0)
return 1;
if (S_ISREG (stbuf.st_mode))
return 1;
return 0;
if (stat (name, &stbuf) == 0)
return S_ISREG (stbuf.st_mode);
else
return errno == ENOENT;
}
static ssize_t
@@ -808,8 +805,7 @@ open_archive (enum access_mode access)
if (backed_up_flag)
undo_last_backup ();
FATAL_ERROR ((0, saved_errno, _("Cannot open %s"),
archive_name_array[0]));
FATAL_ERROR ((0, saved_errno, "%s", archive_name_array[0]));
}
#if !MSDOS
@@ -822,8 +818,9 @@ open_archive (enum access_mode access)
dev_null_output =
(strcmp (archive_name_array[0], dev_null) == 0
|| (! _isrmt (archive)
&& stat (dev_null, &dev_null_stat) == 0
&& S_ISCHR (archive_stat.st_mode)
&& stat (dev_null, &dev_null_stat) == 0
&& S_ISCHR (dev_null_stat.st_mode)
&& archive_stat.st_rdev == dev_null_stat.st_rdev));
}