Changeset 14952

Timestamp:

Aug 23, 2011, 8:35:20 PM (13 years ago)

Author:

xiaofeng

Message:

The kernel does not parse the command line arguments when a image was embedded in the executable. This allows CCL to create a practical command line program.

File:

• trunk/source/lisp-kernel/pmcl-kernel.c (modified) (2 diffs)

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

@@ -1898 +1898 @@
   tcr_area_lock = (void *)new_recursive_lock();
 
+  if (check_for_embedded_image(real_executable_name)) {
+    image_name = real_executable_name;
+  }
+
   program_name = argv[0];
-  if ((argc == 2) && (*argv[1] != '-')) {
-#ifdef WINDOWS
-    image_name = utf_16_argv[1];
-#else
-    image_name = argv[1];
-#endif
-    argv[1] = NULL;
-#ifdef WINDOWS
-    utf_16_argv[1] = NULL;
-#endif
-  } else {
-    process_options(argc,argv,utf_16_argv);
-  }
+
+  if ( image_name == NULL ) {
+    if ((argc == 2) && (*argv[1] != '-')) {
+#ifdef WINDOWS
+      image_name = utf_16_argv[1];
+#else
+      image_name = argv[1];
+#endif
+      argv[1] = NULL;
+#ifdef WINDOWS
+      utf_16_argv[1] = NULL;
+#endif
+    } else {
+      process_options(argc,argv,utf_16_argv);
+    }
+  }
+
   if (lisp_heap_gc_threshold != DEFAULT_LISP_HEAP_GC_THRESHOLD) {
     lisp_heap_threshold_set_from_command_line = true;
@@ -1917 +1925 @@
 
   initial_stack_size = ensure_stack_limit(initial_stack_size);
+  
   if (image_name == NULL) {
-    if (check_for_embedded_image(real_executable_name)) {
-      image_name = real_executable_name;
-    } else {
-      image_name = default_image_name(real_executable_name);
-    }
+    image_name = default_image_name(real_executable_name);
   }