diff options
-rw-r--r-- | ChangeLog | 8 | ||||
-rw-r--r-- | io.c | 11 | ||||
-rw-r--r-- | pc/ChangeLog | 4 | ||||
-rw-r--r-- | pc/config.h | 9 |
4 files changed, 26 insertions, 6 deletions
@@ -1,3 +1,11 @@ +2011-09-30 Eli Zaretskii <eliz@gnu.org> + + * io.c (remap_std_file): Fix non-portable code that caused + redirected "print" to fail if a previous read from standard input + returned EOF. Reported by David Millis <tvtronix@yahoo.com>. + (remap_std_file): Per Eli's suggestion, removed the leading close + of oldfd and will let dup2 do the close for us. + 2011-10-09 Arnold D. Robbins <arnold@skeeve.com> * dfa.c: Sync with GNU grep. @@ -444,9 +444,14 @@ remap_std_file(int oldfd) int newfd; int ret = -1; - close(oldfd); - newfd = open("/dev/null", O_RDWR); - if (newfd >= 0 && newfd != oldfd) { + /* + * Give OS-specific routines in gawkmisc.c chance to interpret + * "/dev/null" as appropriate for their platforms. + */ + newfd = os_devopen("/dev/null", O_RDWR); + if (newfd == INVALID_HANDLE) + newfd = open("/dev/null", O_RDWR); + if (newfd >= 0) { /* dup2() will close oldfd for us first. */ ret = dup2(newfd, oldfd); if (ret == 0) diff --git a/pc/ChangeLog b/pc/ChangeLog index 8aaeb418..8f676de6 100644 --- a/pc/ChangeLog +++ b/pc/ChangeLog @@ -1,3 +1,7 @@ +2011-09-30 Eli Zaretskii <eliz@gnu.org> + + * config.h: Update packaging related versions. + 2011-06-23 Arnold D. Robbins <arnold@skeeve.com> * ChangeLog.0: Rotated ChangeLog into this file. diff --git a/pc/config.h b/pc/config.h index 4dd797c1..69c511d7 100644 --- a/pc/config.h +++ b/pc/config.h @@ -416,16 +416,19 @@ #define PACKAGE_NAME "GNU Awk" /* Define to the full name and version of this package. */ -#define PACKAGE_STRING "GNU Awk 3.1.5a" +#define PACKAGE_STRING "GNU Awk 4.0.0" /* Define to the one symbol short name of this package. */ #define PACKAGE_TARNAME "gawk" +/* Define to the home page for this package. */ +#define PACKAGE_URL "http://www.gnu.org/software/gawk/" + /* Define to the version of this package. */ -#define PACKAGE_VERSION "3.1.5a" +#define PACKAGE_VERSION "4.0.0" /* Version number of package */ -#define VERSION "3.1.5a" +#define VERSION "4.0.0" /* Number of bits in a file offset, on hosts where this is settable. */ /* #undef _FILE_OFFSET_BITS */ |