From c1d70e1a522d8c82ca8898a46d746f2f352bf6d5 Mon Sep 17 00:00:00 2001 From: Thomas Koenig Date: Thu, 13 Oct 2005 16:15:30 +0000 Subject: [PATCH] unix.c (fd_alloc_r_at): Use read() instead of do_read() only in case of special files (e.g. 2005-10-13 Thomas Koenig * io/unix.c(fd_alloc_r_at): Use read() instead of do_read() only in case of special files (e.g. terminals). From-SVN: r105373 --- libgfortran/ChangeLog | 9 +++++++-- libgfortran/io/unix.c | 30 ++++++++++++++++++++++++------ 2 files changed, 31 insertions(+), 8 deletions(-) diff --git a/libgfortran/ChangeLog b/libgfortran/ChangeLog index 8afd8717af6..16552eedb5e 100644 --- a/libgfortran/ChangeLog +++ b/libgfortran/ChangeLog @@ -1,3 +1,8 @@ +2005-10-13 Thomas Koenig + + * io/unix.c(fd_alloc_r_at): Use read() instead of do_read() + only in case of special files (e.g. terminals). + 2005-20-13 Uros Bizjak * config/fpu-387.h (set_fpu): Add "=m" for stmxcsr. @@ -26,8 +31,8 @@ 2005-10-12 Janne Blomqvist - * io/unix.c: Remove parts of patch of 2005/10/07 that cause - input from the terminal to hang. + * io/unix.c(fd_alloc_r_at): Remove parts of patch of 2005/10/07 that + cause input from the terminal to hang. 2005-10-11 Steven G. Kargl diff --git a/libgfortran/io/unix.c b/libgfortran/io/unix.c index de018af1f03..ea03515f468 100644 --- a/libgfortran/io/unix.c +++ b/libgfortran/io/unix.c @@ -440,7 +440,6 @@ static char * fd_alloc_r_at (unix_stream * s, int *len, gfc_offset where) { gfc_offset m; - int n; if (where == -1) where = s->logical_offset; @@ -462,13 +461,32 @@ fd_alloc_r_at (unix_stream * s, int *len, gfc_offset where) if (s->physical_offset != m && lseek (s->fd, m, SEEK_SET) < 0) return NULL; - n = read (s->fd, s->buffer + s->active, s->len - s->active); - if (n < 0) - return NULL; + /* do_read() hangs on read from terminals for *BSD-systems. Only + use read() in that case. */ - s->physical_offset = where + n; + if (s->special_file) + { + ssize_t n; + + n = read (s->fd, s->buffer + s->active, s->len - s->active); + if (n < 0) + return NULL; + + s->physical_offset = where + n; + s->active += n; + } + else + { + size_t n; + + n = s->len - s->active; + if (do_read (s, s->buffer + s->active, &n) != 0) + return NULL; + + s->physical_offset = where + n; + s->active += n; + } - s->active += n; if (s->active < *len) *len = s->active; /* Bytes actually available */