mirror/guile
mirror/guile
1
Fork 0
mirror of https://git.savannah.gnu.org/git/guile.git synced 2025-06-15 16:20:17 +02:00
Code Activity

Make -s switch optional.

Browse source
This commit is contained in:
Neil Jerram 2003-08-30 21:22:45 +00:00
parent 0f008a157a
commit defdc4b4ee
3 changed files with 11 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

1
THANKS
View file

@ -51,6 +51,7 @@ For fixes or providing information which led to a fix:
Momchil Velikov Momchil Velikov
Panagiotis Vossos Panagiotis Vossos
Neil W. Van Dyke Neil W. Van Dyke
Aaron VanDevender
Michael Talbot-Wilson Michael Talbot-Wilson
Andy Wingo Andy Wingo
Keith Wright Keith Wright

6
libguile/ChangeLog
View file

@ -1,3 +1,9 @@
2003-08-30 Neil Jerram <neil@ossau.uklinux.net>
* script.c (scm_compile_shell_switches): Make -s switch optional
if file to be loaded does not begin with a `-'. (Thanks to Aaron
VanDevender for the patch!)
2003-08-30 Kevin Ryde <user42@zip.com.au> 2003-08-30 Kevin Ryde <user42@zip.com.au>
* numbers.c (scm_lognot): Rewrite using ~ and mpz_com, for directness * numbers.c (scm_lognot): Rewrite using ~ and mpz_com, for directness

7
libguile/script.c
View file

@ -352,11 +352,12 @@ scm_shell_usage (int fatal, char *message)
"Usage: %s OPTION ...\n" "Usage: %s OPTION ...\n"
"Evaluate Scheme code, interactively or from a script.\n" "Evaluate Scheme code, interactively or from a script.\n"
"\n" "\n"
" -s SCRIPT load Scheme source code from FILE, and exit\n" " [-s] FILE load Scheme source code from FILE, and exit\n"
" -c EXPR evalute Scheme expression EXPR, and exit\n" " -c EXPR evalute Scheme expression EXPR, and exit\n"
" -- stop scanning arguments; run interactively\n" " -- stop scanning arguments; run interactively\n"
"The above switches stop argument processing, and pass all\n" "The above switches stop argument processing, and pass all\n"
"remaining arguments as the value of (command-line).\n" "remaining arguments as the value of (command-line).\n"
"If FILE begins with `-' the -s switch is mandatory.\n"
"\n" "\n"
" -l FILE load Scheme source code from FILE\n" " -l FILE load Scheme source code from FILE\n"
" -e FUNCTION after reading script, apply FUNCTION to\n" " -e FUNCTION after reading script, apply FUNCTION to\n"
@ -436,9 +437,9 @@ scm_compile_shell_switches (int argc, char **argv)
for (i = 1; i < argc; i++) for (i = 1; i < argc; i++)
{ {
if (! strcmp (argv[i], "-s")) /* load script */ if ((! strcmp (argv[i], "-s")) || (argv[i][0] != '-')) /* load script */
{ {
if (++i >= argc) if ((argv[i][0] == '-') && (++i >= argc))
scm_shell_usage (1, "missing argument to `-s' switch"); scm_shell_usage (1, "missing argument to `-s' switch");
/* If we specified the -ds option, do_script points to the /* If we specified the -ds option, do_script points to the