xemacs-beta: src/emacs.c comparison

comparison src/emacs.c @ 404:2f8bb876ab1d r21-2-32

Import from CVS: tag r21-2-32

author	cvs
date	Mon, 13 Aug 2007 11:16:07 +0200
parents	a86b2b5e0111
children	b8cc9ab3f761

comparison

equal deleted inserted replaced

-:9f011ab08d48
+:2f8bb876ab1d
 #include "syssignal.h" /* Always include before systty.h */
 #include "systty.h"
 #include "sysfile.h"
 #include "systime.h"
+#ifdef PDUMP
+#include "dump-id.h"
+#include "dumper.h"
+#endif
+#ifndef SEPCHAR
+#define SEPCHAR ':'
+#endif
 #ifdef QUANTIFY
 #include <quantify.h>
 #endif
 #ifdef HAVE_SHLIB
 #endif
 /* For PATH_EXEC */
 #include <paths.h>
-#ifdef HEAP_IN_DATA
+#if defined (HEAP_IN_DATA) && !defined(PDUMP)
 void report_sheap_usage (int die_if_pure_storage_exceeded);
 #endif
 #if !defined (SYSTEM_MALLOC) && !defined (DOUG_LEA_MALLOC)
 extern void *(*__malloc_hook)(size_t);
 int inhibit_early_packages;
 /* Nonzero means don't load package autoloads at startup */
 int inhibit_autoloads;
+/* Nonzero means don't load the dump file (ignored if not PDUMP)  */
+int nodumpfile;
 /* Nonzero means print debug information about path searching */
 int debug_paths;
 /* Save argv and argc.  */
 static char **initial_argv;
 /* Signal code for the fatal signal that was received */
 static int fatal_error_code;
 /* Nonzero if handling a fatal error already */
 static int fatal_error_in_progress;
+static JMP_BUF run_temacs_catch;
+static int run_temacs_argc;
+static char **run_temacs_argv;
+static char *run_temacs_args;
+static size_t run_temacs_argv_size;
+static size_t run_temacs_args_size;
 static void shut_down_emacs (int sig, Lisp_Object stuff);
 /* Handle bus errors, illegal instruction, etc. */
 SIGTYPE
 /* Signal the same code; this time it will really be fatal. */
 kill (getpid (), fatal_error_code);
 SIGRETURN;
 }
-DOESNT_RETURN
-fatal (const char *fmt, ...)
-{
-va_list args;
-va_start (args, fmt);
-fprintf (stderr, "\nXEmacs: ");
-vfprintf (stderr, GETTEXT (fmt), args);
-fprintf (stderr, "\n");
-va_end (args);
-fflush (stderr);
-exit (1);
-}
-/* #### The following two functions should be replaced with
-calls to emacs_doprnt_*() functions, with STREAM set to send out
-to stdout or stderr.  This is the only way to ensure that
-I18N3 works properly (many implementations of the *printf()
-functions, including the ones included in glibc, do not implement
-the %###$ argument-positioning syntax). */
-/* exactly equivalent to fprintf (stderr, fmt, ...) except that it calls
-GETTEXT on the format string. */
-int
-stderr_out (const char *fmt, ...)
-{
-int retval;
-va_list args;
-va_start (args, fmt);
-retval = vfprintf (stderr, GETTEXT (fmt), args);
-va_end (args);
-/* fflush (stderr); */
-return retval;
-}
-/* exactly equivalent to fprintf (stdout, fmt, ...) except that it calls
-GETTEXT on the format string. */
-int
-stdout_out (const char *fmt, ...)
-{
-int retval;
-va_list args;
-va_start (args, fmt);
-retval = vfprintf (stdout, GETTEXT (fmt), args);
-va_end (args);
-return retval;
-}
 #ifdef SIGDANGER
 /* Handler for SIGDANGER.  */
 SIGTYPE
 * work with dumping.  But malloc_jumpstart() and malloc_freezedry() in
 * unexnext.c are both completely undocumented, even in NS header files!
 * But hey, it solves all NS related memory problems, so who's
 * complaining? */
 if (initialized && malloc_jumpstart (malloc_cookie) != 0)
-fprintf (stderr, "malloc jumpstart failed!\n");
+stderr_out ("malloc jumpstart failed!\n");
 #endif /* NeXT */
 /*
 #if defined (GNU_MALLOC) && \
 defined (ERROR_CHECK_MALLOC) && \
 #ifdef HAVE_WINDOW_SYSTEM
 inhibit_window_system = 0;
 #else
 inhibit_window_system = 1;
 #endif
+/* Handle the -sd/--show-dump-id switch, which means show the hex dump_id and quit */
+if (argmatch (argv, argc, "-sd", "--show-dump-id", 9, NULL, &skip_args))
+{
+#ifdef PDUMP
+printf ("%08x\n", dump_id);
+#else
+printf ("*ERROR**\n");
+#endif
+exit (0);
+}
 /* Handle the -t switch, which specifies filename to use as terminal */
 {
 char *term;
 if (argmatch (argv, argc, "-t", "--terminal", 4, &term, &skip_args))
 #endif
 	stderr_out ("Using %s", term);
 	inhibit_window_system = 1;	/* -t => -nw */
 }
 }
+/* Handle the --no-dump-file/-nd switch, which means don't load the dump file (ignored when not using pdump) */
+if (argmatch (argv, argc, "-nd", "--no-dump-file", 7, NULL, &skip_args))
+{
+nodumpfile = 1;
+}
 /* Handle -nw switch */
 if (argmatch (argv, argc, "-nw", "--no-windows", 6, NULL, &skip_args))
 inhibit_window_system = 1;
 purify_flag = 0;
 #ifdef PDUMP
 if (restart)
 initialized = 1;
-else {
+else if (nodumpfile) {
-initialized = pdump_load ();
+initialized = 0;
-purify_flag = !initialized;
+purify_flag = 1;
+} else {
+initialized = pdump_load (argv[0]);
+if (initialized)
+run_temacs_argc = -1;
+else
+purify_flag = 1;
 }
 #else
 if (!initialized)
 purify_flag = 1;
 #endif
 syms_of_frame ();
 syms_of_general ();
 syms_of_glyphs ();
 syms_of_glyphs_eimage ();
 syms_of_glyphs_widget ();
-#if defined (HAVE_MENUBARS) || defined (HAVE_SCROLLBARS) || defined (HAVE_DIALOGS) || defined (HAVE_TOOLBARS)
 syms_of_gui ();
-#endif
 syms_of_gutter ();
 syms_of_indent ();
 syms_of_intl ();
 syms_of_keymap ();
 syms_of_lread ();
 syms_of_eldap ();
 #endif
 #ifdef HAVE_GPM
 	  syms_of_gpmevent ();
+#endif
+#ifdef HAVE_POSTGRESQL
+syms_of_postgresql ();
 #endif
 /* Now create the subtypes for the types that have them.
 	 We do this before the vars_*() because more symbols
 	 may get initialized here. */
 	 Fset() on a symbol that is unbound
 	 assigning a symbol or constant value to a variable
 	 using a global variable that has been initialized
 	   earlier on in the same function
-	 Any of the object-creating functions on alloc.c: e.g.
+	 Any of the object-creating functions in alloc.c: e.g.
 	 make_pure_*()
 	 make_string()
 	 build_string()
 	 make_vector()
 vars_of_font_lock ();
 vars_of_frame ();
 vars_of_glyphs ();
 vars_of_glyphs_eimage ();
 vars_of_glyphs_widget ();
-#if defined (HAVE_MENUBARS) || defined (HAVE_SCROLLBARS) || defined (HAVE_DIALOGS) || defined (HAVE_TOOLBARS)
 vars_of_gui ();
-#endif
 vars_of_gutter ();
 vars_of_indent ();
 vars_of_insdel ();
 vars_of_intl ();
 #ifdef HAVE_XIM
 #ifdef HAVE_LDAP
 vars_of_eldap ();
 #endif
+#ifdef HAVE_POSTGRESQL
+vars_of_postgresql();
+#endif
 #ifdef HAVE_GPM
 	  vars_of_gpmevent ();
 #endif
 /* Now initialize any specifier variables.  We do this later
 reinit_vars_of_event_mswindows ();
 #endif
 reinit_vars_of_event_stream ();
 reinit_vars_of_events ();
 reinit_vars_of_extents ();
+reinit_vars_of_fileio ();
 reinit_vars_of_font_lock ();
 reinit_vars_of_glyphs ();
 reinit_vars_of_glyphs_widget ();
 reinit_vars_of_insdel ();
 reinit_vars_of_lread ();
 init_hpplay ();
 #endif
 #ifdef HAVE_TTY
 init_device_tty ();
 #endif
-init_console_stream (); /* Create the first console */
+init_console_stream (restart); /* Create the first console */
 /* try to get the actual pathname of the exec file we are running */
 if (!restart)
 {
 Vinvocation_name = Fcar (Vcommand_line_args);
 };
 static const struct standard_args standard_args[] =
 {
 /* Handled by main_1 above: */
-{ "-nl", "--no-shared-memory", 100, 0 },
+{ "-sd", "--show-dump-id", 105, 0 },
-{ "-t", "--terminal", 95, 1 },
+{ "-t", "--terminal", 100, 1 },
+{ "-nd", "--no-dump-file", 95, 0 },
 { "-nw", "--no-windows", 90, 0 },
 { "-batch", "--batch", 85, 0 },
 { "-debug-paths", "--debug-paths", 82, 0 },
 { "-help", "--help", 80, 0 },
 { "-version", "--version", 75, 0 },
 xfree (new_argv);
 xfree (options);
 xfree (priority);
 }
-static JMP_BUF run_temacs_catch;
-static int run_temacs_argc;
-static char **run_temacs_argv;
-static char *run_temacs_args;
-static size_t run_temacs_argv_size;
-static size_t run_temacs_args_size;
 DEFUN ("running-temacs-p", Frunning_temacs_p, 0, 0, 0, /*
 True if running temacs.  This means we are in the dumping stage.
 This is false during normal execution of the `xemacs' program, and
 becomes false once `run-emacs-from-temacs' is run.
 */
 catchlist = NULL; /* Important!  Otherwise free_cons() calls in
 		       condition_case_unwind() may lead to GC death. */
 unbind_to (0, Qnil); /* this closes loadup.el */
 purify_flag = 0;
 run_temacs_argc = nargs + 1;
-#ifdef HEAP_IN_DATA
+#if defined (HEAP_IN_DATA) && !defined(PDUMP)
 report_sheap_usage (0);
 #endif
 LONGJMP (run_temacs_catch, 1);
 return Qnil; /* not reached; warning suppression */
 }
 if (initialized && (malloc_state_ptr != NULL))
 {
 int rc = malloc_set_state (malloc_state_ptr);
 if (rc != 0)
 	{
-	  fprintf (stderr, "malloc_set_state failed, rc = %d\n", rc);
+	  stderr_out ("malloc_set_state failed, rc = %d\n", rc);
 	  abort ();
 	}
 #if 0
 free (malloc_state_ptr);
 #endif
 }
 opurify = purify_flag;
 purify_flag = 0;
-#ifdef HEAP_IN_DATA
+#if defined (HEAP_IN_DATA) && !defined(PDUMP)
 report_sheap_usage (1);
 #endif
 clear_message ();
 return Qnil;
 }
 #endif /* not CANNOT_DUMP */
-#ifndef SEPCHAR
-#define SEPCHAR ':'
-#endif
 /* Split STRING into a list of substrings.  The substrings are the
 parts of original STRING separated by SEPCHAR.  */
 static Lisp_Object
 split_string_by_emchar_1 (const Bufbyte *string, Bytecount size,
 DEFVAR_LISP ("data-directory", &Vdata_directory /*
 *Directory of architecture-independent files that come with XEmacs,
 intended for XEmacs to use.
 Use of this variable in new code is almost never correct.  See the
-function `locate-data-directory' and the variable `data-directory-list'.
+functions `locate-data-file' and `locate-data-directory' and the variable
+`data-directory-list'.
 */ );
 Vdata_directory = Qnil;
 DEFVAR_LISP ("configure-data-directory", &Vconfigure_data_directory /*
 For internal use by the build procedure only.

Mercurial > hg > xemacs-beta

comparison src/emacs.c @ 404:2f8bb876ab1d r21-2-32