runlisp.c: Remove long-removed `-C' option from usage synopsis.

[runlisp] / runlisp.c

diff --git a/runlisp.c b/runlisp.c
index 4e13663aa2ef1d60a3e2e72a4e0a029856013209..2573b82d37f816b40eea37ac1d56d3be43697ff2 100644 (file)
--- a/runlisp.c
+++ b/runlisp.c
@@ -199,9 +199,10 @@ static void usage(FILE *fp)
   fprintf(fp, "\
 usage:\n\
        %s [OPTIONS] [--] SCRIPT [ARGUMENTS ...]\n\
   fprintf(fp, "\
 usage:\n\
        %s [OPTIONS] [--] SCRIPT [ARGUMENTS ...]\n\

-       %s [OPTIONS] [-e EXPR] [-d EXPR] [-l FILE] [--] [ARGUMENTS ...]\n\
+       %s [OPTIONS] [-e EXPR] [-d EXPR] [-p EXPR] [-l FILE]\n\
+               [--] [ARGUMENTS ...]\n\

 OPTIONS:\n\
 OPTIONS:\n\

-       [-CDEnqv] [+DEn] [-L SYS,SYS,...] [-c CONF] [-o [SECT:]VAR=VAL]\n",
+       [-DEnqv] [+DEn] [-L SYS,SYS,...] [-c CONF] [-o [SECT:]VAR=VAL]\n",

          progname, progname);
 }
 
          progname, progname);
 }
 


@@ -230,7 +231,8 @@ Lisp implementation selection:\n\
 Evaluation mode:\n\
   -d, --dump-expression=EXPR   Print (`prin1') EXPR (repeatable).\n\
   -e, --evaluate-expression=EXPR Evaluate EXPR for effect (repeatable).\n\
 Evaluation mode:\n\
   -d, --dump-expression=EXPR   Print (`prin1') EXPR (repeatable).\n\
   -e, --evaluate-expression=EXPR Evaluate EXPR for effect (repeatable).\n\

-  -l, --load-file=FILE         Load FILE (repeatable).\n",
+  -l, --load-file=FILE         Load FILE (repeatable).\n\
+  -p, --print-expression=EXPR  Print (`princ') EXPR (repeatable).\n",

        fp);
 }
 
        fp);
 }
 


@@ -281,7 +283,7 @@ static void parse_options(int argc, char *argv[])
 
   optarg = 0; optind = 0; optprog = (/*unconst*/ char *)progname;
   for (;;) {
 
   optarg = 0; optind = 0; optprog = (/*unconst*/ char *)progname;
   for (;;) {

-    i = mdwopt(argc, argv, "+hVD+E+L:c:d:e:l:n+o:qv", opts, 0, 0,
+    i = mdwopt(argc, argv, "+hVD+E+L:c:d:e:l:n+o:p:qv", opts, 0, 0,

               OPTF_NEGATION | OPTF_NOPROGNAME);
     if (i < 0) break;
     switch (i) {
               OPTF_NEGATION | OPTF_NOPROGNAME);
     if (i < 0) break;
     switch (i) {


@@ -299,6 +301,7 @@ static void parse_options(int argc, char *argv[])
       case 'l': CMDL; push_eval_op('<', optarg); break;
       FLAGOPT('n', AF_DRYRUN, { CMDL; });
       case 'o': CMDL; if (set_config_var(optarg)) flags |= AF_BOGUS; break;
       case 'l': CMDL; push_eval_op('<', optarg); break;
       FLAGOPT('n', AF_DRYRUN, { CMDL; });
       case 'o': CMDL; if (set_config_var(optarg)) flags |= AF_BOGUS; break;

+      case 'p': CMDL; push_eval_op('=', optarg); break;

       case 'q': CMDL; if (verbose) verbose--; break;
       case 'v': CMDL; verbose++; break;
       default: flags |= AF_BOGUS; break;
       case 'q': CMDL; if (verbose) verbose--; break;
       case 'v': CMDL; verbose++; break;
       default: flags |= AF_BOGUS; break;


@@ -540,8 +543,7 @@ int main(int argc, char *argv[])
   }
   *tail = 0; lisps.tail = tail;
 
   }
   *tail = 0; lisps.tail = tail;
 

-  /* Make sure that the acceptable and preferred Lisps actually exist. */
-  check_lisps("acceptable", &accept, offsetof(struct lispsys, next_accept));
+  /* Make sure that the preferred Lisps actually exist. */

   check_lisps("preferred", &prefer, offsetof(struct lispsys, next_prefer));
 
   /* If there are no acceptable Lisps, then we'll take all of them. */
   check_lisps("preferred", &prefer, offsetof(struct lispsys, next_prefer));
 
   /* If there are no acceptable Lisps, then we'll take all of them. */


@@ -556,13 +558,14 @@ int main(int argc, char *argv[])
 
   /* Build the final list of Lisp systems in the order in which we'll try
    * them: first, preferred Lisps which are acceptable, and then acceptable
 
   /* Build the final list of Lisp systems in the order in which we'll try
    * them: first, preferred Lisps which are acceptable, and then acceptable

-   * Lisps which aren't preferred.
+   * Lisps which are known but not preferred.

    */
   tail = &order.head;
   for (lisp = prefer.head; lisp; lisp = lisp->next_prefer)
     if (lisp->f&LF_ACCEPT) { *tail = lisp; tail = &lisp->next_order; }
   for (lisp = accept.head; lisp; lisp = lisp->next_accept)
    */
   tail = &order.head;
   for (lisp = prefer.head; lisp; lisp = lisp->next_prefer)
     if (lisp->f&LF_ACCEPT) { *tail = lisp; tail = &lisp->next_order; }
   for (lisp = accept.head; lisp; lisp = lisp->next_accept)

-    if (!(lisp->f&LF_PREFER)) { *tail = lisp; tail = &lisp->next_order; }
+    if ((lisp->f&LF_KNOWN) && !(lisp->f&LF_PREFER))
+      { *tail = lisp; tail = &lisp->next_order; }

   *tail = 0;
 
   /* Maybe dump out the various lists of Lisp systems we've collected. */
   *tail = 0;
 
   /* Maybe dump out the various lists of Lisp systems we've collected. */