gawk-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[SCM] gawk branch, gawk-5.2-stable, updated. gawk-4.1.0-5060-g1ae57a46


From: Arnold Robbins
Subject: [SCM] gawk branch, gawk-5.2-stable, updated. gawk-4.1.0-5060-g1ae57a46
Date: Tue, 23 May 2023 22:48:10 -0400 (EDT)

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "gawk".

The branch, gawk-5.2-stable has been updated
       via  1ae57a46de0ee449020feadb400e2f461c55bae5 (commit)
      from  1e727f4008e86935f1762c812c41430c422763b9 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://git.sv.gnu.org/cgit/gawk.git/commit/?id=1ae57a46de0ee449020feadb400e2f461c55bae5

commit 1ae57a46de0ee449020feadb400e2f461c55bae5
Author: Arnold D. Robbins <arnold@skeeve.com>
Date:   Wed May 24 05:47:48 2023 +0300

    Bug fix in extension/readdir.c.

diff --git a/extension/ChangeLog b/extension/ChangeLog
index 3f80a79c..4d34d825 100644
--- a/extension/ChangeLog
+++ b/extension/ChangeLog
@@ -1,3 +1,9 @@
+2023-05-24         Arnold D. Robbins     <arnold@skeeve.com>
+
+       * readdir.c (dir_can_take_file): Only check the stat buffer;
+       the open fd could be on a regular file.
+       (dir_take_control_of): Add the filename to the error output.
+
 2023-05-07         Arnold D. Robbins     <arnold@skeeve.com>
 
 
diff --git a/extension/readdir.c b/extension/readdir.c
index e367ff12..c2d59b2b 100644
--- a/extension/readdir.c
+++ b/extension/readdir.c
@@ -249,7 +249,7 @@ dir_can_take_file(const awk_input_buf_t *iobuf)
        if (iobuf == NULL)
                return awk_false;
 
-       return (iobuf->fd != INVALID_HANDLE || S_ISDIR(iobuf->sbuf.st_mode));
+       return (S_ISDIR(iobuf->sbuf.st_mode));
 }
 
 /*
@@ -277,8 +277,8 @@ dir_take_control_of(awk_input_buf_t *iobuf)
        }
 #endif
        if (dp == NULL) {
-               warning(ext_id, _("dir_take_control_of: opendir/fdopendir 
failed: %s"),
-                               strerror(errno));
+               warning(ext_id, _("dir_take_control_of: %s: opendir/fdopendir 
failed: %s"),
+                               iobuf->name, strerror(errno));
                update_ERRNO_int(errno);
                return awk_false;
        }

-----------------------------------------------------------------------

Summary of changes:
 extension/ChangeLog | 6 ++++++
 extension/readdir.c | 6 +++---
 2 files changed, 9 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
gawk



reply via email to

[Prev in Thread] Current Thread [Next in Thread]