From 2007843ba4adc1b0a3cf6c53a22f3ae69b1049b9 Mon Sep 17 00:00:00 2001
From: Matthew Flatt <mflatt@racket-lang.org>
Date: Tue, 6 Feb 2007 05:14:34 +0000
Subject: [PATCH] add new command-line arguments: -p, -P, -Q

svn: r5557
---
 collects/compiler/start.ss         |   2 +-
 collects/mzlib/cmdline.ss          |  20 +--
 doc/release-notes/mzscheme/HISTORY |   3 +
 man/man1/drscheme.1                |   2 +-
 man/man1/help-desk.1               |   2 +-
 man/man1/mred.1                    |  45 ++++---
 man/man1/mzscheme.1                |  47 ++++---
 src/mred/mrmain.cxx                |  29 -----
 src/mzscheme/cmdline.inc           | 190 +++++++++++++++++++----------
 src/mzscheme/main.c                |   9 --
 src/mzscheme/src/thread.c          |   4 +-
 11 files changed, 205 insertions(+), 148 deletions(-)

diff --git a/collects/compiler/start.ss b/collects/compiler/start.ss
index 2324136ffb..5d34f97330 100644
--- a/collects/compiler/start.ss
+++ b/collects/compiler/start.ss
@@ -379,7 +379,7 @@
 	 ("Set the maximum inlining size" "size")]
 	[("--prim")
 	 ,(lambda (f) (compiler:option:assume-primitives #t))
-	 ("Assume primitive bindings at top-level")]
+	 ("Assume primitive bindings at top level")]
 	[("--stupid")
 	 ,(lambda (f) (compiler:option:stupid #t))
 	 ("Compile despite obvious non-syntactic errors")]
diff --git a/collects/mzlib/cmdline.ss b/collects/mzlib/cmdline.ss
index 11f893d49c..52386d07cd 100644
--- a/collects/mzlib/cmdline.ss
+++ b/collects/mzlib/cmdline.ss
@@ -181,7 +181,7 @@
      [(program arguments table finish finish-help help)
       (parse-command-line program arguments table finish finish-help help
 			  (lambda (flag)
-			    (raise-user-error (string->symbol program) "unknown flag: ~s" flag)))]
+			    (raise-user-error (string->symbol program) "unknown switch: ~s" flag)))]
      [(program arguments0 table finish finish-help help unknown-flag)
       (define arguments (if (vector? arguments0) (vector->list arguments0) arguments0))
       (unless (string? program)
@@ -310,9 +310,9 @@
 		(list #f (list "--help" "-h")
 		      (lambda (f)
 			(let* ([sp (open-output-string)])
-			  (fprintf sp "~a [ <flag> ... ]" program)
+			  (fprintf sp "~a [ <option> ... ]" program)
 			  (print-args sp finish-help finish)
-			  (fprintf sp "~n where <flag> is one of~n")
+			  (fprintf sp "~n where <option> is one of~n")
 			  (for-each
 			   (lambda (set)
 			     (if (eq? (car set) 'help-labels)
@@ -358,12 +358,12 @@
 				  (cdr set))))
 			   table) ; the original table
 			  (fprintf sp "  --help, -h : Show this help~n")
-			  (fprintf sp "  -- : Do not treat any remaining argument as a flag (at this level)~n")
+			  (fprintf sp "  -- : Do not treat any remaining argument as a switch (at this level)~n")
 			  (when (or (assq 'multi table) (assq 'final table))
-			    (fprintf sp " * Asterisks indicate flags allowed multiple times.~n"))
+			    (fprintf sp " * Asterisks indicate options allowed multiple times.~n"))
 			  (when (assq 'once-any table)
-			    (fprintf sp " /|\\ Brackets indicate mutually exclusive flags.~n"))
-			  (fprintf sp " Multiple single-letter flags can be combined after one `-'; for~n")
+			    (fprintf sp " /|\\ Brackets indicate mutually exclusive options.~n"))
+			  (fprintf sp " Multiple single-letter switches can be combined after one `-'; for~n")
 			  (fprintf sp "  example: `-h-' is the same as `-h --'~n")
 			  (help (get-output-string sp))))
 		      (list "Help")))
@@ -427,7 +427,7 @@
 				remaining)])
 		  (if (< remaining needed)
 		      (raise-user-error (string->symbol (format "~a" program))
-					"the ~s flag needs ~a argument~a, but ~a~a provided"
+					"the ~s option needs ~a argument~a, but ~a~a provided"
 					flag needed (if (> needed 1) "s" "")
 					(if (zero? remaining) "" "only ")
 					remaining)
@@ -458,8 +458,8 @@
 			      (raise-user-error 
 			       (string->symbol (format "~a" program))
 			       (let ([s (if (= 1 (length flags))
-					    (format "the ~a flag can only be specified once" (car flags))
-					    (format "only one instance of one flag from ~a is allowed" flags))])
+					    (format "the ~a option can only be specified once" (car flags))
+					    (format "only one instance of one option from ~a is allowed" flags))])
 				 (if orig-multi
 				     (format "~a; note that ~s is shorthand for ~s, in contrast to ~s"
 					     s
diff --git a/doc/release-notes/mzscheme/HISTORY b/doc/release-notes/mzscheme/HISTORY
index 2cf3ae876f..5642e92b99 100644
--- a/doc/release-notes/mzscheme/HISTORY
+++ b/doc/release-notes/mzscheme/HISTORY
@@ -1,3 +1,6 @@
+Version 369.8
+Added -p, -P, and -Q command-line options
+
 Version 369.7
 Added string->path-element and path-element->string
 
diff --git a/man/man1/drscheme.1 b/man/man1/drscheme.1
index c925370e01..bf87391c41 100644
--- a/man/man1/drscheme.1
+++ b/man/man1/drscheme.1
@@ -1,5 +1,5 @@
 .\" dummy line
-.TH DRSCHEME 1 "May 2007"
+.TH DRSCHEME 1 "May 2006"
 .UC 4
 .SH NAME
 drscheme \- The PLT Scheme programming environment
diff --git a/man/man1/help-desk.1 b/man/man1/help-desk.1
index 8d46505363..46aa25c6ce 100644
--- a/man/man1/help-desk.1
+++ b/man/man1/help-desk.1
@@ -1,5 +1,5 @@
 .\" dummy line
-.TH HELP-DESK 1 "May 2007"
+.TH HELP-DESK 1 "May 2006"
 .UC 4
 .SH NAME
 help-desk \- The PLT Scheme documentation center
diff --git a/man/man1/mred.1 b/man/man1/mred.1
index aa89d69ff4..88893eb6b1 100644
--- a/man/man1/mred.1
+++ b/man/man1/mred.1
@@ -1,5 +1,5 @@
 \" dummy line
-.TH MRED 1 "May 2007"
+.TH MRED 1 "January 2007"
 .UC 4
 .SH NAME
 mred \- The PLT Graphical Scheme implementation
@@ -138,6 +138,26 @@ Same as
 .I coll\|\c
 "))'.
 .TP
+.BI \-p \ file \  user \  package
+Same as
+.BR -e \ '(require\ (planet\ "\|\c
+.I file\|\c
+\|" "\|\c
+.I user\|\c
+\|" "\|\c
+.I package\|\c
+"))'.
+.TP
+.BI \-P \ name \  user
+Same as
+.BR -e \ '(require\ (planet\ "\|\c
+.I name\|\c
+\|.ss" "\|\c
+.I user\|\c
+\|" "\|\c
+.I name\|\c
+\|.plt"))'.
+.TP
 .B \-r\fR,\fP \-\^\-script
 Script mode: use as last flag for scripts.
 Same as
@@ -218,6 +238,10 @@ Skips defining `argv' and `program'.
 
 .SH LANGUAGE SETTING OPTIONS
 .TP
+.B \-Q\fR,\fP \-\^\-prim
+Assume primitive bindings at top level by initializing the environment with
+`(require mzscheme)'.
+.TP
 .B \-g\fR,\fP \-\^\-case-sens
 Identifiers and symbols are initially case-sensitive (the default).
 .TP
@@ -248,11 +272,8 @@ Like -v, also suppresses (yield 'wait).
 .TP
 .B \-h\fR,\fP \-\^\-help
 Shows help for command-line arguments.
-.TP
-.BI \-R file\fR,\ \fP \-\^\-restore \ file
-Restores an image; must be the only switch. (Special versions only)
 
-.SH OPTION CONVENTIONS
+.SH COMMAND-LINE CONVENTIONS
 
 Multiple single-letter switches can be collapsed, with arguments placed
 after the collapsed switches; the first collapsed switch cannot be
@@ -267,17 +288,11 @@ is the same as
 .B -m -e
 .IR expr .
 .PP
-Extra arguments following the last switch are put into the Scheme global
+Extra arguments following the last option are put into the Scheme global
 variable `argv' as a vector of strings. The name used to start 
 .I MrEd
 is put into the global variable `program' as a string.
 .PP
-Extra arguments after a 
-.B --restore
-file are returned as a vector of
-strings to the continuation of the `write-image-to-file' call that created
-the image.
-.PP
 Expressions/files are evaluated/loaded in order as provided, including
 calls to
 .B main
@@ -293,7 +308,7 @@ expressions/files are evaluated/loaded, unless the
 .B -x
 or
 .B --no-lib-path
-switch is used.  
+option is used.  
 
 .SH EXECUTABLE NAME
 If the executable name has the form scheme-\|\c
@@ -315,13 +330,13 @@ expressions/files are evaluated/loaded, unless the
 .B -q 
 or 
 .B --no-init-file 
-switch is used.
+option is used.
 .PP
 Unless the
 .B -U
 or
 .B --no-user-path
-switch is provided, the library collections search
+option is provided, the library collections search
 path is read from the PLTCOLLECTS environment variable
 (as a colon-separated list of paths). Where the empty path
 appears in PLTCOLLECTS, it is replaced with the default
diff --git a/man/man1/mzscheme.1 b/man/man1/mzscheme.1
index 716093773a..2631f95487 100644
--- a/man/man1/mzscheme.1
+++ b/man/man1/mzscheme.1
@@ -1,5 +1,5 @@
 .\" dummy line
-.TH MZSCHEME 1 "May 2007"
+.TH MZSCHEME 1 "January 2007"
 .UC 4
 .SH NAME
 mzscheme \- The PLT Scheme implementation
@@ -100,6 +100,26 @@ Same as
 .I coll\|\c
 "))'.
 .TP
+.BI \-p \ file \  user \  package
+Same as
+.BR -e \ '(require\ (planet\ "\|\c
+.I file\|\c
+\|" "\|\c
+.I user\|\c
+\|" "\|\c
+.I package\|\c
+"))'.
+.TP
+.BI \-P \ name \  user
+Same as
+.BR -e \ '(require\ (planet\ "\|\c
+.I name\|\c
+\|.ss" "\|\c
+.I user\|\c
+\|" "\|\c
+.I name\|\c
+\|.plt"))'.
+.TP
 .B \-r\fR,\fP \-\^\-script
 Script mode: use as last flag for scripts.
 Same as
@@ -170,6 +190,10 @@ Skips defining `argv' and `program'.
 
 .SH LANGUAGE SETTING OPTIONS
 .TP
+.B \-Q\fR,\fP \-\^\-prim
+Assume primitive bindings at top level by initializing the environment with
+`(require mzscheme)'.
+.TP
 .B \-g\fR,\fP \-\^\-case-sens
 Identifiers and symbols are initially case-sensitive (the default).
 .TP
@@ -197,14 +221,11 @@ Suppresses the read-eval-print loop.
 .TP
 .B \-h\fR,\fP \-\^\-help
 Shows help for command-line arguments.
-.TP
-.BI \-R file\fR,\ \fP \-\^\-restore \ file
-Restores an image; must be the only switch. (Special versions only)
 
-.SH OPTION CONVENTIONS
+.SH COMMAND-LINE CONVENTIONS
 
 Multiple single-letter switches can be collapsed, with arguments placed
-after the collapsed switches; the first collapsed switch cannot be
+after the collapsed swicthes; the first collapsed switch cannot be
 .BR -- .
 E.g.:
 .B -vfme
@@ -216,17 +237,11 @@ is the same as
 .B -m -e
 .IR expr .
 .PP
-Extra arguments following the last switch are put into the Scheme global
+Extra arguments following the last option are put into the Scheme global
 variable `argv' as a vector of strings. The name used to start 
 .I MzScheme
 is put into the global variable `program' as a string.
 .PP
-Extra arguments after a 
-.B --restore
-file are returned as a vector of
-strings to the continuation of the `write-image-to-file' call that created
-the image.
-.PP
 Expressions/files are evaluated/loaded in order as provided, including
 calls to
 .B main
@@ -242,7 +257,7 @@ expressions/files are evaluated/loaded, unless the
 .B -x
 or
 .B --no-lib-path
-switch is used.  
+option is used.  
 
 .SH EXECUTABLE NAME
 If the executable name has the form scheme-\|\c
@@ -264,13 +279,13 @@ expressions/files are evaluated/loaded, unless the
 .B -q 
 or 
 .B --no-init-file 
-switch is used.
+option is used.
 .PP
 Unless the
 .B -U
 or
 .B --no-user-path
-switch is provided, the library collections search
+option is provided, the library collections search
 path is read from the PLTCOLLECTS environment variable
 (as a colon-separated list of paths). Where the empty path
 appears in PLTCOLLECTS, it is replaced with the default
diff --git a/src/mred/mrmain.cxx b/src/mred/mrmain.cxx
index 4db91fd8c8..82b198eea3 100644
--- a/src/mred/mrmain.cxx
+++ b/src/mred/mrmain.cxx
@@ -63,15 +63,6 @@ extern "C" { typedef int (*ACTUAL_MAIN_PTR)(int argc, char **argv); }
 char *check_for_another = "yes, please check for another";
 #endif
 
-#if defined(_IBMR2)
-static void dangerdanger(int)
-{
-  char *s = "mred: Danger - paging space low\n";
-  write(2, s, strlen(s));
-  scheme_collect_garbage();
-}
-#endif
-
 static void yield_indefinitely()
 {
 #ifdef MZ_PRECISE_GC
@@ -173,23 +164,6 @@ static void interrupt(int)
 #endif
 #endif
 
-#if defined(_IBMR2)
-static int danger_signal_received;
-static void dangerdanger_gui(int)
-{
-  if (danger_signal_received) {
-    fprintf(stderr, "mred: Danger - paging space STILL low - exiting\n");
-    exit(-1);
-  } else {
-    fprintf(stderr, "mred: Danger - paging space low\n");
-    scheme_collect_garbage();
-    danger_signal_received = 1;
-  }
-  
-  signal(SIGDANGER, dangerdanger_gui);
-}
-#endif
-
 static FinishArgs *xfa;
 
 static void do_graph_repl(Scheme_Env *env)
@@ -288,9 +262,6 @@ int main(int argc, char *argv[])
   scheme_set_stack_base(stack_start, 1);
 #endif
 
-#if defined(_IBMR2)
-  signal(SIGDANGER, dangerdanger_gui);
-#endif
 #ifdef wx_x
 # if INTERRUPT_CHECK_ON
   signal(SIGINT, interrupt);
diff --git a/src/mzscheme/cmdline.inc b/src/mzscheme/cmdline.inc
index 002eee7e49..7422e4d7db 100644
--- a/src/mzscheme/cmdline.inc
+++ b/src/mzscheme/cmdline.inc
@@ -3,7 +3,7 @@
 /* This command-line parser is used by both MzScheme and MrEd. */
 /***************************************************************/
 
-#define SDESC "Set! works on undefined identifiers.\n"
+#define SDESC "Set! works on undefined identifiers"
 
 char *cmdline_exe_hack = "[Replace me for EXE hack                                       ]";
 
@@ -232,6 +232,32 @@ static char *make_require_coll(const char *coll)
   return make_require_lib(s, coll);
 }
 
+static char *make_require_planet(const char *file, const char *file_sfx, 
+                                 const char *user, 
+                                 const char *pkg, char *pkg_sfx)
+{
+  char *s;
+  
+  pkg = protect_quote_backslash(pkg);
+  user = protect_quote_backslash(user);
+  
+  s = (char *)malloc(strlen(file) 
+                     + strlen(file_sfx) 
+                     + strlen(user) 
+                     + strlen(pkg) 
+                     + strlen(pkg_sfx) + 46);
+  strcpy(s, "(require (planet \"");
+  strcat(s, file);
+  strcat(s, file_sfx);
+  strcat(s, "\" (\"");
+  strcat(s, user);
+  strcat(s, "\" \"");
+  strcat(s, pkg);
+  strcat(s, pkg_sfx);
+  strcat(s, "\")))");
+  return s;
+}
+
 static char *make_embedded_load(const char *start, const char *end)
 {
   char *s;
@@ -260,6 +286,7 @@ static char *make_embedded_load(const char *start, const char *end)
 #define mzcmd_MAIN 2
 
 typedef struct {
+  int start_with_req;
 #ifndef DONT_PARSE_COMMAND_LINE
   char **evals_and_loads;
   int *eval_kind, num_enl;
@@ -288,6 +315,10 @@ static int finish_cmd_line_run(FinishArgs *fa, Repl_Proc repl)
 {
   volatile int exit_val = 0;
 
+  if (fa->start_with_req) {
+    scheme_eval_string("(require mzscheme)", fa->global_env);    
+  }
+
 #ifndef DONT_LOAD_INIT_FILE
   if (!fa->no_init_file) {
     char *filename;
@@ -459,10 +490,6 @@ static void init_mred(Scheme_Env *global_env)
 int osk_not_console = 0;
 #endif
 
-#if defined(_IBMR2)
-static void dangerdanger(int);
-#endif
-
 #ifndef MZ_XFORM
 # ifndef GC_CAN_IGNORE
 #  define GC_CAN_IGNORE /**/
@@ -484,6 +511,7 @@ static int run_from_cmd_line(int argc, char *_argv[],
   int no_more_switches = 0;
   int mute_banner = 0;
   int no_argv = 0;
+  int start_with_req = 0;
 #endif
 #if !defined(DONT_RUN_REP) || !defined(DONT_PARSE_COMMAND_LINE)
   int no_rep = 0;
@@ -747,6 +775,8 @@ static int run_from_cmd_line(int argc, char *_argv[],
       argv[0] = "-X";
     else if (!strcmp("--search", argv[0]))
       argv[0] = "-S";
+    else if (!strcmp("--prim", argv[0]))
+      argv[0] = "-Q";
 # ifndef MZSCHEME_CMD_LINE
     else if (!strcmp("--nogui", argv[0]))
       argv[0] = "-Z";
@@ -761,10 +791,6 @@ static int run_from_cmd_line(int argc, char *_argv[],
     else if (!strcmp("--yield", argv[0]))
       argv[0] = "-V";
 # endif
-#if defined(_IBMR2)
-    else if (!strcmp("--persistent", argv[0]))
-      argv[0] = "-p";
-#endif
     else if (!strcmp("--restore", argv[0])) {
       PRINTF("--restore or -R<file> must be the first (and only) switch\n");
       goto show_need_help;
@@ -945,6 +971,45 @@ static int run_from_cmd_line(int argc, char *_argv[],
 	  evals_and_loads[num_enl] = se;
 	  eval_kind[num_enl++] = mzcmd_EVAL;
 	  break;
+	case 'p':
+	  if (argc < 4) {
+	    PRINTF("%s: missing %s after %s switch\n", 
+		   prog, 
+		   ((argc > 2) 
+                    ? "package"
+                    : ((argc > 1) 
+                       ? "user and package" 
+                       : "file, user, and package")),
+		   real_switch);
+	    goto show_need_help;
+	  }
+	  argv++;
+	  --argc;
+	  se = make_require_planet(argv[0], "", argv[1], argv[2], "");
+	  evals_and_loads[num_enl] = se;
+	  argv += 2;
+	  argc -= 2;
+	  eval_kind[num_enl++] = mzcmd_EVAL;
+	  break;
+	case 'P':
+	  if (argc < 3) {
+	    PRINTF("%s: missing %s after %s switch\n", 
+		   prog, 
+		   (argc < 2) ? "package/file base name and user" : "package",
+		   real_switch);
+	    goto show_need_help;
+	  }
+	  argv++;
+	  --argc;
+	  se = make_require_planet(argv[0], ".ss", argv[1], argv[0], ".plt");
+	  evals_and_loads[num_enl] = se;
+	  argv++;
+	  --argc;
+	  eval_kind[num_enl++] = mzcmd_EVAL;
+	  break;
+        case 'Q':
+          start_with_req = 1;
+          break;
 	case 'w':
 	  se = make_require_lib("awk.ss", "mzlib");
 	  evals_and_loads[num_enl] = se;
@@ -1018,11 +1083,6 @@ static int run_from_cmd_line(int argc, char *_argv[],
 	  no_front = 1;
 	  break;
 #endif
-#if defined(_IBMR2)
-	case 'p':
-	  signal(SIGDANGER, dangerdanger);
-	  break;
-#endif
 #ifdef USE_OSKIT_CONSOLE
 	case 'S':
 	  osk_not_console = 1;
@@ -1052,7 +1112,7 @@ static int run_from_cmd_line(int argc, char *_argv[],
       PRINTF(BANNER);
 #ifdef MZSCHEME_CMD_LINE  
     if (scheme_get_allow_set_undefined())
-      PRINTF(SDESC);
+      PRINTF(SDESC ".\n");
 # ifdef DOS_FILE_SYSTEM
 #  if !defined(FILES_HAVE_FDS)
 #   if !defined(WINDOWS_FILE_HANDLES)
@@ -1139,6 +1199,7 @@ static int run_from_cmd_line(int argc, char *_argv[],
 #endif
 
   fa = (FinishArgs *)scheme_malloc(sizeof(FinishArgs));
+  fa->start_with_req = start_with_req;
 #ifndef DONT_PARSE_COMMAND_LINE
   fa->evals_and_loads = evals_and_loads;
   fa->eval_kind = eval_kind;
@@ -1168,93 +1229,94 @@ static int run_from_cmd_line(int argc, char *_argv[],
 #ifndef DONT_PARSE_COMMAND_LINE
  show_help:
   prog =("%s"
+         PROGRAM_LC " [<option> ...] <argument> ...\n"
 # ifndef MZSCHEME_CMD_LINE
 #  ifdef wx_x
-	 " X switches (must precede all other flags):\n"
+	 " X options (must precede all other options):\n"
 	 "  -display <display>, -geometry <geometry>, -fn <font>, -font <font>,\n"
          "  -bg <color>, -background <color>, -fg <color>, -foreground <color>,\n"
 	 "  -iconic, -name <name>, -rv, -reverse, +rv, -selectionTimeout <timeout>,\n"
 	 "  -synchronous, -title <title>, -xnllanguage <language>, -xrm <file>\n"
 #  endif
 # endif
-	 " Startup file and expression switches:\n"
-	 "  -e <expr>, --eval <expr> : Evaluates <expr> after " PROGRAM " starts.\n"
-	 "  -f <file>, --load <file> : Loads <file> after " PROGRAM " starts.\n"
-	 "  -d <file>, --load-cd <file> : Load/cds <file> after " PROGRAM " starts.\n"
-	 "  -t <file>, --require <file> : Requires <file> after " PROGRAM " starts.\n"
-	 "  -F, --Load : Loads all remaining arguments after " PROGRAM " starts.\n"
-	 "  -D, --Load-cd : Load/cds all remaining arguments after " PROGRAM " starts.\n"
-	 "  -T, --Require : Requires all remaining arguments after " PROGRAM " starts.\n"
-	 "  -l <file>, --mzlib <file> : Same as -e '(require (lib \"<file>\"))'.\n"
-	 "  -L <file> <coll> : Same as -e '(require (lib \"<file>\" \"<coll>\"))'.\n"
-	 "  -M <coll> : Same as -e '(require (lib \"<coll>.ss\" \"<coll>\"))'.\n"
-	 "  -r, --script : Script mode: use as last switch for scripts. Same as -fmv-.\n" 
-	 "  -i, --script-cd : Like -r, but also sets the directory. Same as -dmv-.\n"
-	 "  -u, --require-script : Like -r, but requires a module. Same as -tmv-.\n" 
+	 " Startup file and expression options:\n"
+	 "  -e <expr>, --eval <expr> : Evaluates <expr> after " PROGRAM " starts\n"
+	 "  -f <file>, --load <file> : Loads <file> after " PROGRAM " starts\n"
+	 "  -d <file>, --load-cd <file> : Load/cds <file> after " PROGRAM " starts\n"
+	 "  -t <file>, --require <file> : Requires <file> after " PROGRAM " starts\n"
+	 "  -F, --Load : Loads all remaining arguments after " PROGRAM " starts\n"
+	 "  -D, --Load-cd : Load/cds all remaining arguments after " PROGRAM " starts\n"
+	 "  -T, --Require : Requires all remaining arguments after " PROGRAM " starts\n"
+	 "  -l <file>, --mzlib <file> : Same as -e '(require (lib \"<file>\"))'\n"
+	 "  -L <file> <coll> : Same as -e '(require (lib \"<file>\" \"<coll>\"))'\n"
+	 "  -M <coll> : Same as -e '(require (lib \"<coll>.ss\" \"<coll>\"))'\n"
+	 "  -p <fl> <u> <pkg> : Same as -e '(require (planet \"<fl>\" (\"<u>\" \"<pkg>\"))'\n"
+	 "  -P <nm> <u> : Same as -e '(require (planet \"<nm>.ss\" (\"<u>\" \"<nm>.plt\"))'\n"
+	 "  -r, --script : Script mode: use as last option for scripts; same as -fmv-\n" 
+	 "  -i, --script-cd : Like -r, but also sets the directory; same as -dmv-\n"
+	 "  -u, --require-script : Like -r, but requires a module; same as -tmv-\n" 
 # ifndef MZSCHEME_CMD_LINE
-	 "  -Z, --nogui : Skip \"class.ss\" & \"mred.ss\" require, load handler set.\n"
+	 "  -Z, --nogui : Skip \"class.ss\" & \"mred.ss\" require, load handler set\n"
 # endif
 # ifdef CMDLINE_STDIO_FLAG
-	 "  -z, --stdio : Show version, use read-eval-print-loop (not graphical-...).\n"
-	 "  -K, --back : Don't bring application to the foreground (Mac OS X).\n"
+	 "  -z, --stdio : Show version, use read-eval-print-loop (not graphical-...)\n"
+	 "  -K, --back : Don't bring application to the foreground (Mac OS X)\n"
 # endif
-	 "  -w, --awk : Same as -l awk.ss.\n"
-	 "  -k <n> <m> : Load executable-embedded code from file offset <n> to <m>.\n"
-	 "  -C, --main : Like -r, then call `main' w/argument list; car is file name.\n"
-	 " Initialization switches:\n"
-	 "  -X <dir>, --collects <dir> : Main collects at <dir> relative to " PROGRAM ".\n"
-	 "  -S <dir>, --search <dir> : More collects at <dir> relative to " PROGRAM ".\n"
+	 "  -w, --awk : Same as -l awk.ss\n"
+	 "  -k <n> <m> : Load executable-embedded code from file offset <n> to <m>\n"
+	 "  -C, --main : Like -r, then call `main' w/argument list; car is file name\n"
+	 " Initialization options:\n"
+	 "  -X <dir>, --collects <dir> : Main collects at <dir> relative to " PROGRAM "\n"
+	 "  -S <dir>, --search <dir> : More collects at <dir> relative to " PROGRAM "\n"
 	 "  -U, --no-user-path : Ignores user-specific collects, etc.\n"
-         "  -x, --no-lib-path : Skips trying to set current-library-collection-paths.\n"
-	 "  -q, --no-init-file : Skips trying to load " INIT_FILENAME ".\n"
-	 "  -N <file>, --name <file> : Sets `program' to <file>.\n"
-	 "  -A : Skips defining `argv' and `program'.\n"
+         "  -x, --no-lib-path : Skips trying to set current-library-collection-paths\n"
+	 "  -q, --no-init-file : Skips trying to load " INIT_FILENAME "\n"
+	 "  -N <file>, --name <file> : Sets `program' to <file>\n"
+	 "  -A : Skips defining `argv' and `program'\n"
 # ifdef MZ_USE_JIT
-	 "  -j, --no-jit : Disables just-in-time compiler.\n"
+	 "  -j, --no-jit : Disables just-in-time compiler\n"
 # else
-	 "  -j, --no-jit : No effect, since the just-in-time compiler is unavailable.\n"
-# endif
-	 " Language setting switches:\n"
-	 "  -g, --case-sens : Identifiers/symbols are initially case-sensitive.\n"
-	 "  -G, --case-insens : Identifiers/symbols are initially case-insensitive.\n"
-	 "  -s, --set-undef : " SDESC
-	 " Miscellaneous switches:\n"
-	 "  -- : No argument following this switch is used as a switch.\n"
-# if defined(_IBMR2)
-	 "  -p, --persistent : Catches SIGDANGER (low page space) signal.\n"
+	 "  -j, --no-jit : No effect, since the just-in-time compiler is unavailable\n"
 # endif
+	 " Language setting options:\n"
+         "  -Q, --prim : Assume primitive bindings at top level\n"
+	 "  -g, --case-sens : Identifiers/symbols are initially case-sensitive\n"
+	 "  -G, --case-insens : Identifiers/symbols are initially case-insensitive\n"
+	 "  -s, --set-undef : " SDESC "\n"
+	 " Miscellaneous options:\n"
+	 "  -- : No argument following this switch is used as a switch\n"
 	 "  -m, --mute-banner : Suppresses "
 # ifdef MZSCHEME_CMD_LINE  
 	 "the startup banner"
 # else
 	 "-v/--version/-z/--stdio"
 # endif
-	 " text.\n"
+	 " text\n"
 	 "  -v, --version : Suppresses the read-eval-print loop"
 # ifdef MZSCHEME_CMD_LINE  
-	 ".\n"
+	 "\n"
 # else
-	 ", prints version.\n"
+	 ", prints version\n"
 # endif
 # ifdef VERSION_YIELD_FLAG
-	 "  -V, --no-yield : Like -v, also suppresses (yield 'wait).\n"
+	 "  -V, --no-yield : Like -v, also suppresses (yield 'wait)\n"
 # endif
-	 "  -b, --binary : Read stdin and write stdout/stderr in binary mode.\n"
-	 "  -h, --help : Shows this information and exits, ignoring other switches.\n"
+	 "  -b, --binary : Read stdin and write stdout/stderr in binary mode\n"
+	 "  -h, --help : Shows this information and exits, ignoring other options\n"
 	 "Multiple single-letter switches can be collapsed, with arguments placed\n"
 	 " after the collapsed switches; the first collapsed switch cannot be --.\n"
-	 " E.g.: `-vfme file expr' is the same as `-v -f file -m -e expr'.\n"
-	 "Extra arguments following the last switch are put into the Scheme global\n"
+	 " E.g.: `-vfme file expr' is the same as `-v -f file -m -e expr'\n"
+	 "Extra arguments following the last option are put into the Scheme global\n"
 	 " variable `argv' as a vector of strings. The name used to start " PROGRAM "\n"
 	 " is put into the global variable `program' as a string.\n"
          "Expressions/files/--main/etc. are evaluated/loaded in order as provided.\n"
 	 " An error during evaluation/loading causes later ones to be skipped.\n"
 	 "The current-library-collection-paths is automatically set before any\n"
 	 " expressions/files are evaluated/loaded, unless the -x or --no-lib-path\n"
-	 " switch is used.\n"
+	 " option is used.\n"
 	 "The file " INIT_FILENAME
 	 " is loaded before any provided expressions/files\n"
-	 " are evaluated/loaded, unless the -q or --no-init-file switch is used.\n"
+	 " are evaluated/loaded, unless the -q or --no-init-file option is used.\n"
 # ifdef MACINTOSH_EVENTS
 	 "\n"
 	 "Macintosh Startup files are alphabetized and put after the -F switch\n"
diff --git a/src/mzscheme/main.c b/src/mzscheme/main.c
index 4377268e26..1f56239526 100644
--- a/src/mzscheme/main.c
+++ b/src/mzscheme/main.c
@@ -183,15 +183,6 @@ static void user_break_hit(int ignore)
 
 #endif
 
-#if defined(_IBMR2)
-static void dangerdanger(int ignored)
-{
-  char *s = "mzscheme: Danger - paging space low\n";
-  write(2, s, strlen(s));
-  scheme_collect_garbage();
-}
-#endif
-
 /*========================================================================*/
 /*                                 main                                   */
 /*========================================================================*/
diff --git a/src/mzscheme/src/thread.c b/src/mzscheme/src/thread.c
index 83c35d062a..5be2ff4c78 100644
--- a/src/mzscheme/src/thread.c
+++ b/src/mzscheme/src/thread.c
@@ -3860,12 +3860,12 @@ int scheme_block_until(Scheme_Ready_Fun _f, Scheme_Needs_Wakeup_Fun fdf,
 
   /* We make an sinfo to be polite, but we also assume
      that f will not generate any redirections! */
-  init_schedule_info(&sinfo, 0, sleep_end);
+  init_schedule_info(&sinfo, NULL, sleep_end);
 
   while (!(result = f((Scheme_Object *)data, &sinfo))) {
     sleep_end = sinfo.sleep_end;
     if (sinfo.spin) {
-      init_schedule_info(&sinfo, 0, 0.0);
+      init_schedule_info(&sinfo, NULL, 0.0);
       scheme_thread_block(0.0);
       scheme_current_thread->ran_some = 1;
     } else {