From 64d5075d0ba3e9e8da1208033aa7d5a32fff90bc Mon Sep 17 00:00:00 2001 From: Francois-Xavier Coudert Date: Sun, 10 Apr 2005 12:37:59 +0200 Subject: [PATCH] re PR libfortran/20788 (Loading libgfortran.so clobbers C redirection of stdin/stdout/stderr) PR libfortran/20788 * runtime/environ.c (init_unsigned_integer): Function for environment variables we want to be positive. (init_integer): Function to allow negative environment variables (e.g. for GFORTRAN_STDIN_UNIT). From-SVN: r97946 --- libgfortran/ChangeLog | 8 ++++++++ libgfortran/runtime/environ.c | 32 ++++++++++++++++++++++++++++++-- 2 files changed, 38 insertions(+), 2 deletions(-) diff --git a/libgfortran/ChangeLog b/libgfortran/ChangeLog index 118375417b2..ca2120d26f5 100644 --- a/libgfortran/ChangeLog +++ b/libgfortran/ChangeLog @@ -1,3 +1,11 @@ +2005-04-10 Francois-Xavier Coudert + + PR libfortran/20788 + * runtime/environ.c (init_unsigned_integer): Function for + environment variables we want to be positive. + (init_integer): Function to allow negative environment + variables (e.g. for GFORTRAN_STDIN_UNIT). + 2005-04-10 Thomas Koenig PR libfortran/17992 diff --git a/libgfortran/runtime/environ.c b/libgfortran/runtime/environ.c index 8d608aefaf5..c1a71cf6eef 100644 --- a/libgfortran/runtime/environ.c +++ b/libgfortran/runtime/environ.c @@ -97,13 +97,41 @@ var_source (variable * v) } -/* init_integer()-- Initialize an integer environment variable */ +/* init_integer()-- Initialize an integer environment variable. */ static void init_integer (variable * v) { char *p, *q; + p = getenv (v->name); + if (p == NULL) + goto set_default; + + for (q = p; *q; q++) + if (!isdigit (*q) && (p != q || *q != '-')) + { + v->bad = 1; + goto set_default; + } + + *v->var = atoi (p); + return; + + set_default: + *v->var = v->value; + return; +} + + +/* init_unsigned_integer()-- Initialize an integer environment variable + which has to be positive. */ + +static void +init_unsigned_integer (variable * v) +{ + char *p, *q; + p = getenv (v->name); if (p == NULL) goto set_default; @@ -467,7 +495,7 @@ static variable variable_table[] = { "Print optional plus signs in numbers where permitted. Default FALSE."}, {"GFORTRAN_DEFAULT_RECL", DEFAULT_RECL, &options.default_recl, - init_integer, show_integer, + init_integer, show_unsigned_integer, "Default maximum record length for sequential files. Most useful for\n" "adjusting line length of preconnected units. Default " stringize (DEFAULT_RECL)},