mirror/libarchive
1
0
Fork 0
mirror of https://github.com/libarchive/libarchive.git synced 2026-01-26 15:39:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2797 from mmatuska/fix/treefuncs

Browse Source 
Partially revert "Merge pull request #2679 from AZero13/error"
This commit is contained in:
Martin Matuška 2025-11-28 00:57:09 +01:00 committed by GitHub
commit a819cc2829
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 15 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
libarchive/archive_read_disk_posix.c
View File

@ -2018,11 +2018,8 @@ tree_dup(int fd)
}
#endif /* F_DUPFD_CLOEXEC */
new_fd = dup(fd);
if (new_fd != -1) {
__archive_ensure_cloexec_flag(new_fd);
return (new_fd);
}
return (-1);
__archive_ensure_cloexec_flag(new_fd);
return (new_fd);
}
/*
@ -2144,16 +2141,11 @@ tree_reopen(struct tree *t, const char *path, int restore_time)
* so try again for execute. The consequences of not opening this are
* unhelpful and unnecessary errors later.
*/
if (t->initial_dir_fd < 0) {
if (t->initial_dir_fd < 0)
t->initial_dir_fd = open(".", o_flag | O_CLOEXEC);
if (t->initial_dir_fd < 0)
return NULL;
}
#endif
__archive_ensure_cloexec_flag(t->initial_dir_fd);
t->working_dir_fd = tree_dup(t->initial_dir_fd);
if (t->working_dir_fd < 0)
return NULL;
return (t);
}
@ -2359,15 +2351,20 @@ static int
tree_dir_next_posix(struct tree *t)
{
int r;
#if defined(HAVE_FDOPENDIR)
int fd;
#endif
const char *name;
size_t namelen;
if (t->d == NULL) {
#if defined(HAVE_FDOPENDIR)
int fd = tree_dup(t->working_dir_fd);
if (fd != -1)
t->d = fdopendir(fd);
if (t->working_dir_fd >= 0) {
fd = tree_dup(t->working_dir_fd);
if (fd != -1)
t->d = fdopendir(fd);
}
#else /* HAVE_FDOPENDIR */
if (tree_enter_working_dir(t) == 0) {
t->d = opendir(".");

2
libarchive/archive_read_support_format_mtree.c
View File

@ -1254,7 +1254,7 @@ parse_file(struct archive_read *a, struct archive_entry *entry,
archive_entry_filetype(entry) == AE_IFDIR) {
mtree->fd = open(path, O_RDONLY | O_BINARY | O_CLOEXEC);
__archive_ensure_cloexec_flag(mtree->fd);
if (mtree->fd < 0 && (
if (mtree->fd == -1 && (
#if defined(_WIN32) && !defined(__CYGWIN__)
/*
* On Windows, attempting to open a file with an

6
libarchive/archive_write_disk_posix.c
View File

@ -2561,9 +2561,9 @@ _archive_write_disk_close(struct archive *_a)
* for directories. For other file types
* we need to verify via fstat() or lstat()
*/
if (fd < 0 || p->filetype != AE_IFDIR) {
if (fd == -1 || p->filetype != AE_IFDIR) {
#if HAVE_FSTAT
if (fd >= 0 && (
if (fd > 0 && (
fstat(fd, &st) != 0 ||
la_verify_filetype(st.st_mode,
p->filetype) == 0)) {
@ -4447,7 +4447,7 @@ fixup_appledouble(struct archive_write_disk *a, const char *pathname)
*/
fd = open(pathname, O_RDONLY | O_BINARY | O_CLOEXEC);
__archive_ensure_cloexec_flag(fd);
if (fd < 0) {
if (fd == -1) {
archive_set_error(&a->archive, errno,
"Failed to open a restoring file");
ret = ARCHIVE_WARN;