X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Ferror.c;h=0d1a58791a58aa3107c8bc65eab954dee6dede43;hb=4de79b34b329d1da6cdeb145993d3efd911e2967;hp=142b2c9f6590fc3dc0b71a0c583b2e517931485e;hpb=4fdeb2145d081ff1b84e3f6c99f9d1c048c0d64a;p=pspp diff --git a/src/error.c b/src/error.c index 142b2c9f65..0d1a58791a 100644 --- a/src/error.c +++ b/src/error.c @@ -25,7 +25,7 @@ #include #include "alloc.h" #include "command.h" -#include "getline.h" +#include "getl.h" #include "glob.h" #include "lexer.h" #include "main.h" @@ -35,6 +35,10 @@ #include "var.h" #include "version.h" +#include "gettext.h" +#define _(msgid) gettext (msgid) +#define N_(msgid) msgid + int err_error_count; int err_warning_count; @@ -203,10 +207,12 @@ err_hcf (int success) getl_uninitialize (); free(file_loc); + file_loc = NULL; + nfile_loc = mfile_loc = 0; + outp_done (); done_glob(); - exit (success ? EXIT_SUCCESS : EXIT_FAILURE); } @@ -510,7 +516,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 +528,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);