Continue work on bug 12859, plus some code cleanup.

[pspp] / src / error.c

diff --git a/src/error.c b/src/error.c
index 142b2c9f6590fc3dc0b71a0c583b2e517931485e..3c91f73266ef4848f5a66931322e32ce43e9b2d0 100644 (file)
--- a/src/error.c
+++ b/src/error.c
@@ -203,6 +203,8 @@ err_hcf (int success)
   getl_uninitialize ();
 
   free(file_loc);
+  file_loc = NULL;
+  
   outp_done ();
   done_glob();
 
@@ -510,7 +512,9 @@ request_bug_report_and_abort(const char *msg )
          "default_config_path: %s\n"
          "include_path:        %s\n"
          "groff_font_path:     %s\n"
-         "locale_dir:          %s\n",
+         "locale_dir:          %s\n"
+         "compiler version:    %s\n"
+         ,
 
          bare_version,         
          version,
@@ -520,7 +524,13 @@ request_bug_report_and_abort(const char *msg )
          default_config_path,
          include_path, 
          groff_font_path,
-         locale_dir);     
+         locale_dir,
+#ifdef __VERSION__
+         __VERSION__
+#else
+         "Unknown"
+#endif
+         );     
 
   if ( msg )
     fprintf(stderr,"Diagnosis: %s\n",msg);