X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fruntime%2Fruntime.c;h=8a44604e8dc90214a7d8be6fc538fae93cd16764;hb=92c8db80e039f60623e53a0b9355cf0a9ec49f3d;hp=545fb3514e637e1cae1ed6831ff09ccfabb9c115;hpb=20e05e5ed4cc31a9a97fd07d6fe626c9f3e3f43b;p=sbcl.git diff --git a/src/runtime/runtime.c b/src/runtime/runtime.c index 545fb35..8a44604 100644 --- a/src/runtime/runtime.c +++ b/src/runtime/runtime.c @@ -28,6 +28,7 @@ #include #include #include +#include #if defined(SVR4) || defined(__linux__) #include @@ -69,8 +70,8 @@ static void sigint_handler(int signal, siginfo_t *info, void *void_context) { - lose("\nSIGINT hit at 0x%08lX\n", - (unsigned long) *os_context_pc_addr(void_context)); + lose("\nSIGINT hit at 0x%08lX\n", + (unsigned long) *os_context_pc_addr(void_context)); } /* (This is not static, because we want to be able to call it from @@ -92,9 +93,9 @@ successful_malloc(size_t size) { void* result = malloc(size); if (0 == result) { - lose("malloc failure"); + lose("malloc failure"); } else { - return result; + return result; } return (void *) NULL; /* dummy value: return something ... */ } @@ -110,7 +111,7 @@ copied_existing_filename_or_null(char *filename) { struct stat filename_stat; if (stat(filename, &filename_stat)) { /* if failure */ - return 0; + return 0; } else { return copied_string(filename); } @@ -122,10 +123,10 @@ static lispobj alloc_base_string_list(char *array_ptr[]) { if (*array_ptr) { - return alloc_cons(alloc_base_string(*array_ptr), - alloc_base_string_list(1 + array_ptr)); + return alloc_cons(alloc_base_string(*array_ptr), + alloc_base_string_list(1 + array_ptr)); } else { - return NIL; + return NIL; } } @@ -182,6 +183,7 @@ main(int argc, char *argv[], char *envp[]) /* the name of the core file we're to execute. Note that this is * a malloc'ed string which should be freed eventually. */ char *core = 0; + char **sbcl_argv = 0; /* other command line options */ boolean noinform = 0; @@ -189,6 +191,8 @@ main(int argc, char *argv[], char *envp[]) lispobj initial_function; + setlocale(LC_ALL, ""); + /* KLUDGE: os_vm_page_size is set by os_init(), and on some * systems (e.g. Alpha) arch_init() needs need os_vm_page_size, so * it must follow os_init(). -- WHN 2000-01-26 */ @@ -200,105 +204,108 @@ main(int argc, char *argv[], char *envp[]) /* Parse our part of the command line (aka "runtime options"), * stripping out those options that we handle. */ { - int argi = 1; - while (argi < argc) { - char *arg = argv[argi]; - if (0 == strcmp(arg, "--noinform")) { - noinform = 1; - ++argi; - } else if (0 == strcmp(arg, "--core")) { - if (core) { - lose("more than one core file specified"); - } else { - ++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; - break; - } else { - /* This option was unrecognized as a runtime option, - * so it must be a toplevel option or a user option, - * so we must be past the end of the runtime option - * section. */ - break; - } - } - /* This is where we strip out those options that we handle. We - * also take this opportunity to make sure that we don't find - * an out-of-place "--end-runtime-options" option. */ - { - char *argi0 = argv[argi]; - int argj = 1; - while (argi < argc) { - char *arg = argv[argi++]; - /* If we encounter --end-runtime-options for the first - * time after the point where we had to give up on - * runtime options, then the point where we had to - * give up on runtime options must've been a user - * error. */ - if (!end_runtime_options && - 0 == strcmp(arg, "--end-runtime-options")) { - lose("bad runtime option \"%s\"", argi0); - } - argv[argj++] = arg; - } - argv[argj] = 0; - argc = argj; - } + int argi = 1; + while (argi < argc) { + char *arg = argv[argi]; + if (0 == strcmp(arg, "--noinform")) { + noinform = 1; + ++argi; + } else if (0 == strcmp(arg, "--core")) { + if (core) { + lose("more than one core file specified"); + } else { + ++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; + break; + } else { + /* This option was unrecognized as a runtime option, + * so it must be a toplevel option or a user option, + * so we must be past the end of the runtime option + * section. */ + break; + } + } + /* This is where we strip out those options that we handle. We + * also take this opportunity to make sure that we don't find + * an out-of-place "--end-runtime-options" option. */ + { + char *argi0 = argv[argi]; + int argj = 1; + /* (argc - argi) for the arguments, one for the binary, + and one for the terminating NULL. */ + sbcl_argv = successful_malloc((2 + argc - argi) * sizeof(char *)); + sbcl_argv[0] = argv[0]; + while (argi < argc) { + char *arg = argv[argi++]; + /* If we encounter --end-runtime-options for the first + * time after the point where we had to give up on + * runtime options, then the point where we had to + * give up on runtime options must've been a user + * error. */ + if (!end_runtime_options && + 0 == strcmp(arg, "--end-runtime-options")) { + lose("bad runtime option \"%s\"", argi0); + } + sbcl_argv[argj++] = arg; + } + sbcl_argv[argj] = 0; + } } /* If no core file was specified, look for one. */ if (!core) { - char *sbcl_home = getenv("SBCL_HOME"); - 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"); - } + char *sbcl_home = getenv("SBCL_HOME"); + 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"); + } } /* 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); + 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); + print_banner(); + fflush(stdout); } #if defined(SVR4) || defined(__linux__) @@ -314,7 +321,7 @@ main(int argc, char *argv[], char *envp[]) initial_function = load_core_file(core); if (initial_function == NIL) { - lose("couldn't find initial function"); + lose("couldn't find initial function"); } SHOW("freeing core"); free(core); @@ -327,7 +334,8 @@ main(int argc, char *argv[], char *envp[]) /* Convert remaining argv values to something that Lisp can grok. */ SHOW("setting POSIX-ARGV symbol value"); - SetSymbolValue(POSIX_ARGV, alloc_base_string_list(argv),0); + SetSymbolValue(POSIX_ARGV, alloc_base_string_list(sbcl_argv),0); + free(sbcl_argv); /* Install a handler to pick off SIGINT until the Lisp system gets * far enough along to install its own handler. */ @@ -336,5 +344,5 @@ main(int argc, char *argv[], char *envp[]) FSHOW((stderr, "/funcalling initial_function=0x%lx\n", initial_function)); create_initial_thread(initial_function); lose("CATS. CATS ARE NICE."); + return 0; } -