mirrors/tar
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/tar.git synced 2026-08-28 03:46:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

tar: don't worry about fdopendir closing its argument

Browse Source 
* NEWS: Don't mention dirfd; no longer needed.
* gnulib.modules: Remove dirfd.
* src/create.c (get_directory_entries): Remove the code dealing
with dirfd failures, as the new fdopendir replacement doesn't
close its argument so we don't need to call dirfd.  See
<http://lists.gnu.org/archive/html/bug-gnulib/2010-09/msg00208.html>
and gnulib commit 970c9038e4cca46e1b037ae0a6d574dfae6a7327.
This commit is contained in:
Paul Eggert
2010-09-13 13:13:08 -07:00
parent d7db30d0e8
commit 0fb3020da0
3 changed files with 5 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/create.c
+4 -43
View File
@@ -1263,49 +1263,10 @@ open_failure_recover (struct tar_stat_info const *dir)
char *
get_directory_entries (struct tar_stat_info *st)
{
DIR *dirstream;
while (! (dirstream = fdopendir (st->fd)) && open_failure_recover (st))
continue;
if (! dirstream)
return 0;
else
{
char *entries = streamsavedir (dirstream);
int streamsavedir_errno = errno;
int fd = dirfd (dirstream);
if (fd < 0)
{
/* The dirent.h implementation doesn't use file descriptors
for directory streams, so open the directory again. */
char const *name = st->orig_file_name;
if (closedir (dirstream) != 0)
close_diag (name);
dirstream = 0;
fd = subfile_open (st->parent,
st->parent ? last_component (name) : name,
open_searchdir_flags);
if (fd < 0)
fd = - errno;
else
{
struct stat dirst;
if (! (fstat (fd, &dirst) == 0
&& st->stat.st_ino == dirst.st_ino
&& st->stat.st_dev == dirst.st_dev))
{
close (fd);
fd = - IMPOSTOR_ERRNO;
}
}
}
st->fd = fd;
st->dirstream = dirstream;
errno = streamsavedir_errno;
return entries;
}
while (! (st->dirstream = fdopendir (st->fd)))
if (! open_failure_recover (st))
return 0;
return streamsavedir (st->dirstream);
}
/* Dump the directory ST. Return true if successful, false (emitting