X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fruntime%2Fruntime.c;h=039dac65f1aca777022b74a42a3f2cd57748a562;hb=dc5e3163fe667e2629c7769aa8cf2e501eeeefa6;hp=aa54b85b757f37575542bf1ca20992c64511c730;hpb=686043635c45a16b418d2cc96a7f704fdab182c2;p=sbcl.git
diff --git a/src/runtime/runtime.c b/src/runtime/runtime.c
index aa54b85..039dac6 100644
--- a/src/runtime/runtime.c
+++ b/src/runtime/runtime.c
@@ -198,15 +198,19 @@ main(int argc, char *argv[], char *envp[])
char *sbcl_home = getenv("SBCL_HOME");
if (sbcl_home) {
char *lookhere;
- lookhere = (char *) calloc(strlen("/sbcl.core") + strlen(sbcl_home) + 1,
- sizeof(char));
- sprintf(lookhere, "%s/sbcl.core", sbcl_home);
+ char *stem = "/sbcl.core";
+ lookhere = (char *) calloc(strlen(sbcl_home) +
+ strlen(stem) +
+ 1,
+ sizeof(char));
+ sprintf(lookhere, "%s%s", sbcl_home, stem);
core = copied_existing_filename_or_null(lookhere);
free(lookhere);
} else {
core = copied_existing_filename_or_null("/usr/lib/sbcl.core");
if (!core) {
- core = copied_existing_filename_or_null("/usr/local/lib/sbcl.core");
+ core =
+ copied_existing_filename_or_null("/usr/local/lib/sbcl.core");
}
}
if (!core) {
@@ -216,7 +220,7 @@ main(int argc, char *argv[], char *envp[])
if (!noinform) {
printf(
-"This is SBCL " SBCL_VERSION_STRING ", an implementation of ANSI Common Lisp.\n\
+"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\
@@ -233,8 +237,8 @@ It is mostly in the public domain, but also includes some software copyrighted\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 on SBCL is available at .\n\
-");
+More information about SBCL is available at .\n\
+", SBCL_VERSION_STRING);
fflush(stdout);
}
@@ -250,11 +254,6 @@ More information on SBCL is available at .\n\
set_lossage_handler(monitor_or_something);
-#if 0
- os_init();
- gc_init();
- validate();
-#endif
globals_init();
initial_function = load_core_file(core);
@@ -272,9 +271,6 @@ More information on SBCL is available at .\n\
#ifdef BINDING_STACK_POINTER
SetSymbolValue(BINDING_STACK_POINTER, BINDING_STACK_START);
#endif
-#if defined INTERNAL_GC_TRIGGER && !defined __i386__
- SetSymbolValue(INTERNAL_GC_TRIGGER, make_fixnum(-1));
-#endif
interrupt_init();