diff options
| author | Bruno Haible <bruno@clisp.org> | 2005-01-12 13:02:55 +0000 |
|---|---|---|
| committer | Bruno Haible <bruno@clisp.org> | 2009-06-23 12:12:02 +0200 |
| commit | e8a783d55570c9e75c07e50ae92202c3e146071c (patch) | |
| tree | 8b2cb2971683fd84869e3ef53b1790f321919347 | |
| parent | d4b5debc160a83e1c52bc6831019351a6061b68e (diff) | |
| download | external_gettext-e8a783d55570c9e75c07e50ae92202c3e146071c.zip external_gettext-e8a783d55570c9e75c07e50ae92202c3e146071c.tar.gz external_gettext-e8a783d55570c9e75c07e50ae92202c3e146071c.tar.bz2 | |
Update 'safe-read' module from gnulib.
| -rw-r--r-- | gettext-tools/lib/ChangeLog | 4 | ||||
| -rw-r--r-- | gettext-tools/lib/safe-read.c | 38 |
2 files changed, 23 insertions, 19 deletions
diff --git a/gettext-tools/lib/ChangeLog b/gettext-tools/lib/ChangeLog index 8e991c8..11b9445 100644 --- a/gettext-tools/lib/ChangeLog +++ b/gettext-tools/lib/ChangeLog @@ -92,6 +92,10 @@ 2004-08-06 Paul Eggert <eggert@cs.ucla.edu> + * safe-read.c: Import changes from coreutils. + +2004-08-06 Paul Eggert <eggert@cs.ucla.edu> + * quotearg.c, quotearg.h: Import changes from coreutils. 2004-08-06 Paul Eggert <eggert@cs.ucla.edu> diff --git a/gettext-tools/lib/safe-read.c b/gettext-tools/lib/safe-read.c index c21d1cf..6f8bd78 100644 --- a/gettext-tools/lib/safe-read.c +++ b/gettext-tools/lib/safe-read.c @@ -1,5 +1,7 @@ /* An interface to read and write that retries after interrupts. - Copyright (C) 1993, 1994, 1998, 2002-2003 Free Software Foundation, Inc. + + Copyright (C) 1993, 1994, 1998, 2002, 2003, 2004 Free Software + Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -33,9 +35,6 @@ #endif #include <errno.h> -#ifndef errno -extern int errno; -#endif #ifdef EINTR # define IS_EINTR(x) ((x) == EINTR) @@ -61,22 +60,23 @@ extern int errno; size_t safe_rw (int fd, void const *buf, size_t count) { - ssize_t result; - - /* POSIX limits COUNT to SSIZE_MAX, but we limit it further, requiring - that COUNT <= INT_MAX, to avoid triggering a bug in Tru64 5.1. - When decreasing COUNT, keep the file pointer block-aligned. - Note that in any case, read(write) may succeed, yet read(write) - fewer than COUNT bytes, so the caller must be prepared to handle - partial results. */ - if (count > INT_MAX) - count = INT_MAX & ~8191; + /* Work around a bug in Tru64 5.1. Attempting to read more than + INT_MAX bytes fails with errno == EINVAL. See + <http://lists.gnu.org/archive/html/bug-gnu-utils/2002-04/msg00010.html>. + When decreasing COUNT, keep it block-aligned. */ + enum { BUGGY_READ_MAXIMUM = INT_MAX & ~8191 }; - do + for (;;) { - result = rw (fd, buf, count); - } - while (result < 0 && IS_EINTR (errno)); + ssize_t result = rw (fd, buf, count); - return (size_t) result; + if (0 <= result) + return result; + else if (IS_EINTR (errno)) + continue; + else if (errno == EINVAL && BUGGY_READ_MAXIMUM < count) + count = BUGGY_READ_MAXIMUM; + else + return result; + } } |