Get rid of static vars in VALUE LABELS, ADD VALUE LABELS.

[pspp] / src / main.c

diff --git a/src/main.c b/src/main.c
index 3f519e5e0f6974ab477b1d01c268a111a0083660..d69e661d74422f0960aedf698c76b745a10a01eb 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -18,19 +18,24 @@
    02111-1307, USA. */
 
 #include <config.h>
+#include "main.h"
 #include <assert.h>
 #include <stdio.h>
+#include "cmdline.h"
 #include "command.h"
 #include "error.h"
 #include "getline.h"
+#include "glob.h"
 #include "lexer.h"
 #include "output.h"
+#include "version.h"
+#include <signal.h>
 
 #include <stdlib.h>
 
 #include "debug-print.h"
 
-static void parse_script (void) __attribute__ ((noreturn));
+static void parse_script (void) NO_RETURN;
 static void handle_error (int code);
 static int execute_command (void);
 
@@ -43,6 +48,10 @@ int finished;
 /* The current date in the form DD MMM YYYY. */
 char curdate[12];
 
+
+/* If a segfault happens, issue a message to that effect and halt */
+void bug_handler(int sig);
+
 /* Whether we're dropping down to interactive mode immediately because
    we hit end-of-file unexpectedly (or whatever). */
 int start_interactive;
@@ -51,8 +60,7 @@ int start_interactive;
 int
 main (int argc, char **argv)
 {
-  void init_glob (int, char **);       /* Exported by glob.c. */
-  void parse_command_line (int, char **);      /* Exported by cmdline.c */
+  signal (SIGSEGV, bug_handler);
 
   /* Initialization. */
   if (!outp_init ())
@@ -153,3 +161,43 @@ handle_error (int code)
   else
     lex_discard_line ();
 }
+
+
+
+/* If a segfault happens, issue a message to that effect and halt */
+void 
+bug_handler(int sig UNUSED)
+{
+  fprintf(stderr,
+         "******************************************************************\n"
+         "You have discovered a bug in PSPP.\n\n"
+         "  Please report this, by sending "
+         "an email to " PACKAGE_BUGREPORT ",\n"
+         "explaining what you were doing when this happened, and including\n"
+         "a sample of your input file which caused it.\n");
+
+  fprintf(stderr,
+         "Also, please copy the following lines into your bug report:\n\n"
+         "bare_version:        %s\n" 
+         "version:             %s\n"
+         "stat_version:        %s\n"
+         "host_system:         %s\n"
+         "build_system:        %s\n"
+         "default_config_path: %s\n"
+         "include_path:        %s\n"
+         "groff_font_path:     %s\n"
+         "locale_dir:          %s\n"
+         "******************************************************************\n",
+         bare_version,         
+         version,
+         stat_version,
+         host_system,        
+         build_system,
+         default_config_path,
+         include_path, 
+         groff_font_path,
+         locale_dir);     
+
+  exit(-1);
+}
+