From 8809f6f94554707be1f58e35a61e2a3b7ced9554 Mon Sep 17 00:00:00 2001 From: Francois-Xavier Coudert Date: Tue, 10 May 2005 10:34:58 +0200 Subject: [PATCH] re PR libfortran/20788 (Loading libgfortran.so clobbers C redirection of stdin/stdout/stderr) PR libfortran/20788 Missing entry from previous commit: * io/unix.c (fd_to_stream): Add an avoid_mmap argument indicating we don't we to mmap this stream. Use fd_open instead of mmap_open in that case. (open_external): Call fd_to_stream with avoid_mmap = 0. (input_stream): Call fd_to_stream with avoid_mmap = 1. (output_stream): Likewise. (error_stream): Likewise. Really committing: * io/read.c (read_f): Accept 'e', 'E', 'd' and 'D' as first non-blank characters of a real number. From-SVN: r99508 --- libgfortran/ChangeLog | 11 +++++++++++ libgfortran/io/read.c | 6 ++++-- 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/libgfortran/ChangeLog b/libgfortran/ChangeLog index 3da84b68d34..496da2ec533 100644 --- a/libgfortran/ChangeLog +++ b/libgfortran/ChangeLog @@ -1,3 +1,14 @@ +2005-05-10 Francois-Xavier Coudert + + PR libfortran/20788 + * io/unix.c (fd_to_stream): Add an avoid_mmap argument indicating + we don't we to mmap this stream. Use fd_open instead of mmap_open + in that case. + (open_external): Call fd_to_stream with avoid_mmap = 0. + (input_stream): Call fd_to_stream with avoid_mmap = 1. + (output_stream): Likewise. + (error_stream): Likewise. + 2005-05-09 Mike Stump * configure: Regenerate. diff --git a/libgfortran/io/read.c b/libgfortran/io/read.c index 2087ac54aeb..1c8b3b0daa8 100644 --- a/libgfortran/io/read.c +++ b/libgfortran/io/read.c @@ -536,9 +536,11 @@ read_f (fnode * f, char *dest, int length) exponent_sign = 1; - /* A digit (or a '.') is required at this point */ + /* A digit, a '.' or a exponent character ('e', 'E', 'd' or 'D') + is required at this point */ - if (!isdigit (*p) && *p != '.') + if (!isdigit (*p) && *p != '.' && *p != 'd' && *p != 'D' + && *p != 'e' && *p != 'E') goto bad_float; /* Remember the position of the first digit. */