diff options
| author | Francois-Xavier Coudert <coudert@clipper.ens.fr> | 2005-04-10 12:37:59 +0200 |
|---|---|---|
| committer | François-Xavier Coudert <fxcoudert@gcc.gnu.org> | 2005-04-10 10:37:59 +0000 |
| commit | 64d5075d0ba3e9e8da1208033aa7d5a32fff90bc (patch) | |
| tree | 373a5bce8f5033bab314b344e1726a3f26fd6a88 /libgfortran/runtime/environ.c | |
| parent | eb232f4ef11305a4c2ce9ae0cc7975eafd942153 (diff) | |
| download | gcc-64d5075d0ba3e9e8da1208033aa7d5a32fff90bc.zip gcc-64d5075d0ba3e9e8da1208033aa7d5a32fff90bc.tar.gz gcc-64d5075d0ba3e9e8da1208033aa7d5a32fff90bc.tar.bz2 | |
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
Diffstat (limited to 'libgfortran/runtime/environ.c')
| -rw-r--r-- | libgfortran/runtime/environ.c | 32 |
1 files changed, 30 insertions, 2 deletions
diff --git a/libgfortran/runtime/environ.c b/libgfortran/runtime/environ.c index 8d608ae..c1a71cf 100644 --- a/libgfortran/runtime/environ.c +++ b/libgfortran/runtime/environ.c @@ -97,7 +97,7 @@ var_source (variable * v) } -/* init_integer()-- Initialize an integer environment variable */ +/* init_integer()-- Initialize an integer environment variable. */ static void init_integer (variable * v) @@ -109,6 +109,34 @@ init_integer (variable * v) 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; + + for (q = p; *q; q++) if (!isdigit (*q)) { v->bad = 1; @@ -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)}, |