mirror of
https://git.savannah.gnu.org/git/guile.git
synced 2025-05-09 23:40:29 +02:00
* script.c (scm_compile_shell_switches): don't append (quit) if
interactive. (scm_shell): call scm_exit_status and exit on the result of the evaluation.
This commit is contained in:
parent
1fbc60b2c3
commit
08fea0882d
2 changed files with 14 additions and 6 deletions
|
@ -1,3 +1,10 @@
|
||||||
|
Tue May 13 04:34:52 1997 Gary Houston <ghouston@actrix.gen.nz>
|
||||||
|
|
||||||
|
* script.c (scm_compile_shell_switches): don't append (quit) if
|
||||||
|
interactive.
|
||||||
|
(scm_shell): call scm_exit_status and exit on the result of the
|
||||||
|
evaluation.
|
||||||
|
|
||||||
Mon May 12 17:23:58 1997 Jim Blandy <jimb@floss.cyclic.com>
|
Mon May 12 17:23:58 1997 Jim Blandy <jimb@floss.cyclic.com>
|
||||||
|
|
||||||
Ensure that shared substrings are handled properly when passed to
|
Ensure that shared substrings are handled properly when passed to
|
||||||
|
|
|
@ -761,12 +761,13 @@ scm_compile_shell_switches (int argc, char **argv)
|
||||||
tail = scm_cons (scm_cons (sym_load_user_init, SCM_EOL), tail);
|
tail = scm_cons (scm_cons (sym_load_user_init, SCM_EOL), tail);
|
||||||
tail = scm_cons (scm_cons (sym_top_repl, SCM_EOL), tail);
|
tail = scm_cons (scm_cons (sym_top_repl, SCM_EOL), tail);
|
||||||
}
|
}
|
||||||
|
else
|
||||||
/* After doing all the other actions prescribed by the command line,
|
{
|
||||||
quit. */
|
/* After doing all the other actions prescribed by the command line,
|
||||||
tail = scm_cons (scm_cons (sym_quit, SCM_EOL),
|
quit. */
|
||||||
|
tail = scm_cons (scm_cons (sym_quit, SCM_EOL),
|
||||||
tail);
|
tail);
|
||||||
|
}
|
||||||
{
|
{
|
||||||
/* We want a path only containing directories from SCHEME_LOAD_PATH,
|
/* We want a path only containing directories from SCHEME_LOAD_PATH,
|
||||||
SCM_SITE_DIR and SCM_LIBRARY_DIR when searching for the site init
|
SCM_SITE_DIR and SCM_LIBRARY_DIR when searching for the site init
|
||||||
|
@ -813,7 +814,7 @@ scm_shell (argc, argv)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
scm_eval_x (scm_compile_shell_switches (argc, argv));
|
exit (scm_exit_status (scm_eval_x (scm_compile_shell_switches (argc,argv))));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue