X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fruntime%2Fruntime.c;h=ec0d5bc7eb1fa51414e0d1b38b594a897141de95;hb=dcf5978d9d33098e868ae6eea28e1b310038c03d;hp=32cad8a1bf48a8c382055d2063d929d6c8ead441;hpb=2378b4fe567a8fea78b1e4915b9497d8c18ca92f;p=sbcl.git

diff --git a/src/runtime/runtime.c b/src/runtime/runtime.c
index 32cad8a..ec0d5bc 100644
--- a/src/runtime/runtime.c
+++ b/src/runtime/runtime.c
@@ -62,6 +62,11 @@
 #include <string.h>
 #include "interr.h"
 #endif
+
+#ifndef SBCL_HOME
+#define SBCL_HOME "/usr/local/lib/sbcl/"
+#endif
+
 
 /* SIGINT handler that invokes the monitor (for when Lisp isn't up to it) */
 static void
@@ -278,46 +283,36 @@ main(int argc, char *argv[], char *envp[])
     /* If no core file was specified, look for one. */
     if (!core) {
 	char *sbcl_home = getenv("SBCL_HOME");
-	if (sbcl_home) {
-	    char *lookhere;
-	    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 {
-	    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/lib/sbcl/sbcl.core");
-	    }
-	}
+	char *lookhere;
+	char *stem = "/sbcl.core";
+	if(!sbcl_home) sbcl_home = SBCL_HOME;
+	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);
 	if (!core) {
 	    lose("can't find core file");
 	}
-    } else {
-	/* If a core was specified and SBCL_HOME is unset, set it */
-	char *sbcl_home = getenv("SBCL_HOME");
-	if (!sbcl_home) {
-	    char *envstring, *copied_core, *dir;
-	    char *stem = "SBCL_HOME=";
-	    copied_core = copied_string(core);
-	    dir = dirname(copied_core);
-	    envstring = (char *) calloc(strlen(stem) +
-					strlen(dir) + 
-					1,
-					sizeof(char));
-	    sprintf(envstring, "%s%s", stem, dir);
-	    putenv(envstring);
-	    free(copied_core);
-	}
     }
-
+    /* Make sure that SBCL_HOME is set, no matter where the core was
+     * found */
+    if (!getenv("SBCL_HOME")) {
+	char *envstring, *copied_core, *dir;
+	char *stem = "SBCL_HOME=";
+	copied_core = copied_string(core);
+	dir = dirname(copied_core);
+	envstring = (char *) calloc(strlen(stem) +
+				    strlen(dir) + 
+				    1,
+				    sizeof(char));
+	sprintf(envstring, "%s%s", stem, dir);
+	putenv(envstring);
+	free(copied_core);
+    }
+    
     if (!noinform) {
 	print_banner();
 	fflush(stdout);
@@ -379,6 +374,7 @@ static void parent_sighandler(int signum,siginfo_t *info, void *void_context)
 }
 
 #ifdef LISP_FEATURE_SB_THREAD
+int show_thread_exit=0;
 
 static void /* noreturn */ parent_loop(void)
 {
@@ -407,7 +403,7 @@ static void /* noreturn */ parent_loop(void)
     while(!all_threads) {
 	sched_yield();
     }
-    while(all_threads && (pid=waitpid(-1,&status,__WALL|WUNTRACED))) {
+    while(all_threads && (pid=waitpid(-1,&status,__WALL))) {
 	struct thread *th;
 	int real_errno=errno;
 	if(pid==-1) {
@@ -418,10 +414,11 @@ static void /* noreturn */ parent_loop(void)
 	    fprintf(stderr,"waitpid: %s\n",strerror(real_errno));
 	    continue;
 	}
-	th=find_thread_by_pid(pid);
-	if(!th) continue;
 	if(WIFEXITED(status) || WIFSIGNALED(status)) {
-	    fprintf(stderr,"waitpid : child %d %x exited \n", pid,th);
+	    th=find_thread_by_pid(pid);
+	    if(!th) continue;
+	    if(show_thread_exit)
+		fprintf(stderr,"waitpid : child %d %x exited \n", pid,th);
 	    destroy_thread(th);
 	    if(!all_threads) break;
 	}