[Openmcl-cvs-notifications] r15159 - /trunk/source/lisp-kernel/pmcl-kernel.c

[gb at clozure.com]

Author: gb
Date: Thu Dec 29 06:20:04 2011
New Revision: 15159

Log:
Conditionalize out support for treating a single command-line
argument as an image name.  This is a minor incompatible change,
but relieves some users of the stigma and shame of writing shell
script wrappers.

Modified:
    trunk/source/lisp-kernel/pmcl-kernel.c

Modified: trunk/source/lisp-kernel/pmcl-kernel.c
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/source/lisp-kernel/pmcl-kernel.c (original)
+++ trunk/source/lisp-kernel/pmcl-kernel.c Thu Dec 29 06:20:04 2011
@@ -1086,7 +1086,9 @@
     fprintf(dbgout, "%s\n", herald);
   }
   fprintf(dbgout, "usage: %s <options>\n", program_name);
+#ifdef SINGLE_ARG_SHORTHAND
   fprintf(dbgout, "\t or %s <image-name>\n", program_name);
+#endif
   fprintf(dbgout, "\t where <options> are one or more of:\n");
   if (other_args && *other_args) {
     fputs(other_args, dbgout);
@@ -1892,6 +1894,7 @@
   tcr_area_lock =3D (void *)new_recursive_lock();
 =

   program_name =3D argv[0];
+#ifdef SINGLE_ARG_SHORTHAND
   if ((argc =3D=3D 2) && (*argv[1] !=3D '-')) {
 #ifdef WINDOWS
     image_name =3D utf_16_argv[1];
@@ -1903,8 +1906,11 @@
     utf_16_argv[1] =3D NULL;
 #endif
   } else {
+#endif  /* SINGLE_ARG_SHORTHAND */
     process_options(argc,argv,utf_16_argv);
-  }
+#ifdef SINGLE_ARG_SHORTHAND
+  }
+#endif
   if (lisp_heap_gc_threshold !=3D DEFAULT_LISP_HEAP_GC_THRESHOLD) {
     lisp_heap_threshold_set_from_command_line =3D true;
   }