Formerly variable.c.~4~

This commit is contained in:
Roland McGrath 1992-05-12 04:42:11 +00:00
parent 8696be1950
commit 8486a30c74

View file

@ -370,13 +370,13 @@ define_automatic_variables ()
/* This won't override any definition, but it
will provide one if there isn't one there. */
v = define_variable ("SHELL", 5, default_shell, o_default, 0);
v->export = 1;
/* Don't let SHELL come from the environment
if MAKELEVEL is 0. Also, SHELL must not be empty. */
if (*v->value == '\0' || (v->origin == o_env && makelevel == 0))
/* Don't let SHELL come from the environment. */
if (*v->value == '\0' || (v->origin == o_env))
{
v->origin = o_file;
v->value = savestring ("/bin/sh", 7);
v->value = savestring (default_shell, 7);
}
}