X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;ds=inline;f=src%2Fruntime%2Fruntime.c;h=908bd8cbacf1c426c05375b95c06d8d7689b2aed;hb=98f3f617894ce24a40764aa98606ce68c5482cf0;hp=039dac65f1aca777022b74a42a3f2cd57748a562;hpb=dc5e3163fe667e2629c7769aa8cf2e501eeeefa6;p=sbcl.git
diff --git a/src/runtime/runtime.c b/src/runtime/runtime.c
index 039dac6..908bd8c 100644
--- a/src/runtime/runtime.c
+++ b/src/runtime/runtime.c
@@ -40,9 +40,6 @@
#include "interr.h"
#include "monitor.h"
#include "validate.h"
-#if defined GENCGC
-#include "gencgc.h"
-#endif
#include "core.h"
#include "save.h"
#include "lispregs.h"
@@ -116,6 +113,63 @@ alloc_string_list(char *array_ptr[])
}
}
+/* miscellaneous chattiness */
+
+void
+print_help()
+{
+ puts(
+"SBCL is a Common Lisp programming environment. Ordinarily you shouldn't\n\
+need command line options when you invoke it interactively: you can just\n\
+start it and work with the customary Lisp READ-EVAL-PRINT loop.\n\
+\n\
+One option idiom which is sometimes useful interactively (e.g. when\n\
+exercising a test case for a bug report) is\n\
+ sbcl --sysinit /dev/null --userinit /dev/null\n\
+to keep SBCL from reading any initialization files at startup. And some\n\
+people like to suppress the default startup message:\n\
+ sbcl --noinform\n\
+\n\
+Other options can be useful when you're running SBCL noninteractively,\n\
+e.g. from a script, or if you have a strange system configuration, so\n\
+that SBCL can't by default find one of the files it needs. For\n\
+information on such options, see the sbcl(1) man page.\n\
+\n\
+More information on SBCL can be found on its man page, or at\n\
+.\n");
+}
+
+void
+print_version()
+{
+ printf("SBCL %s\n", SBCL_VERSION_STRING);
+}
+
+void
+print_banner()
+{
+ printf(
+"This is SBCL %s, an implementation of ANSI Common Lisp.\n\
+\n\
+SBCL is derived from the CMU CL system created at Carnegie Mellon University.\n\
+Besides software and documentation originally created at Carnegie Mellon\n\
+University, SBCL contains some software originally from the Massachusetts\n\
+Institute of Technology, Symbolics Incorporated, and Xerox Corporation, and\n\
+material contributed by volunteers since the release of CMU CL into the\n\
+public domain. See the CREDITS file in the distribution for more information.\n\
+\n\
+SBCL is a free software system, provided as is, with absolutely no warranty.\n\
+It is mostly in the public domain, but also includes some software copyrighted\n\
+ Massachusetts Institute of Technology, 1986;\n\
+ Symbolics, Inc., 1989, 1990, 1991, 1992; and\n\
+ Xerox Corporation, 1985, 1986, 1987, 1988, 1989, 1990\n\
+used under BSD-style licenses allowing copying only under certain conditions.\n\
+See the COPYING file in the distribution for more information.\n\
+\n\
+More information about SBCL is available at .\n\
+", SBCL_VERSION_STRING);
+}
+
int
main(int argc, char *argv[], char *envp[])
{
@@ -151,12 +205,22 @@ main(int argc, char *argv[], char *envp[])
lose("more than one core file specified");
} else {
++argi;
- core = copied_string(argv[argi]);
if (argi >= argc) {
lose("missing filename for --core argument");
}
+ core = copied_string(argv[argi]);
++argi;
}
+ } else if (0 == strcmp(arg, "--help")) {
+ /* I think this is the (or a) usual convention: upon
+ * seeing "--help" we immediately print our help
+ * string and exit, ignoring everything else. */
+ print_help();
+ exit(0);
+ } else if (0 == strcmp(arg, "--version")) {
+ /* As in "--help" case, I think this is expected. */
+ print_version();
+ exit(0);
} else if (0 == strcmp(arg, "--end-runtime-options")) {
end_runtime_options = 1;
++argi;
@@ -207,10 +271,12 @@ main(int argc, char *argv[], char *envp[])
core = copied_existing_filename_or_null(lookhere);
free(lookhere);
} else {
- core = copied_existing_filename_or_null("/usr/lib/sbcl.core");
+ putenv("SBCL_HOME=/usr/local/lib/sbcl/");
+ core = copied_existing_filename_or_null("/usr/local/lib/sbcl/sbcl.core");
if (!core) {
+ putenv("SBCL_HOME=/usr/lib/sbcl/");
core =
- copied_existing_filename_or_null("/usr/local/lib/sbcl.core");
+ copied_existing_filename_or_null("/usr/lib/sbcl/sbcl.core");
}
}
if (!core) {
@@ -219,26 +285,7 @@ main(int argc, char *argv[], char *envp[])
}
if (!noinform) {
- printf(
-"This is SBCL %s, an implementation of ANSI Common Lisp.\n\
-\n\
-SBCL is derived from the CMU CL system created at Carnegie Mellon University.\n\
-Besides software and documentation originally created at Carnegie Mellon\n\
-University, SBCL contains some software originally from the Massachusetts\n\
-Institute of Technology, Symbolics Incorporated, and Xerox Corporation, and\n\
-material contributed by volunteers since the release of CMU CL into the\n\
-public domain. See the CREDITS file in the distribution for more information.\n\
-\n\
-SBCL is a free software system, provided as is, with absolutely no warranty.\n\
-It is mostly in the public domain, but also includes some software copyrighted\n\
- Massachusetts Institute of Technology, 1986;\n\
- Symbolics, Inc., 1989, 1990, 1991, 1992; and\n\
- Xerox Corporation, 1985, 1986, 1987, 1988, 1989, 1990\n\
-used under BSD-style licenses allowing copying only under certain conditions.\n\
-See the COPYING file in the distribution for more information.\n\
-\n\
-More information about SBCL is available at .\n\
-", SBCL_VERSION_STRING);
+ print_banner();
fflush(stdout);
}
@@ -263,10 +310,7 @@ More information about SBCL is available at .\n\
SHOW("freeing core");
free(core);
-#if defined GENCGC
- gencgc_pickup_dynamic();
-#else
-#endif
+ gc_initialize_pointers();
#ifdef BINDING_STACK_POINTER
SetSymbolValue(BINDING_STACK_POINTER, BINDING_STACK_START);