X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Ferror.c;h=0d1a58791a58aa3107c8bc65eab954dee6dede43;hb=45b8514ebb8a7b10eb5d911a231a9fc7974f8ba9;hp=65a7b0f10a2bf3c035068387c4138c153e936c77;hpb=74a57f26f1458b28a0fddbb9f46004ac8f4d9c30;p=pspp-builds.git diff --git a/src/error.c b/src/error.c index 65a7b0f1..0d1a5879 100644 --- a/src/error.c +++ b/src/error.c @@ -14,11 +14,10 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA - 02111-1307, USA. */ + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA + 02110-1301, USA. */ #include -#include #include "error.h" #include #include @@ -26,12 +25,19 @@ #include #include "alloc.h" #include "command.h" -#include "getline.h" +#include "getl.h" +#include "glob.h" +#include "lexer.h" #include "main.h" #include "output.h" #include "settings.h" #include "str.h" #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; @@ -51,27 +57,16 @@ static int nfile_loc, mfile_loc; void tmsg (int class, const char *title, const char *format, ...) { - char buf[1024]; - - /* Format the message into BUF. */ - { - va_list args; + struct error e; + va_list args; - va_start (args, format); - vsnprintf (buf, 1024, format, args); - va_end (args); - } - - /* Output the message. */ - { - struct error e; + e.class = class; + err_location (&e.where); + e.title = title; - e.class = class; - err_location (&e.where); - e.title = title; - e.text = buf; - err_vmsg (&e); - } + va_start (args, format); + err_vmsg (&e, format, args); + va_end (args); } /* Writes error message in CLASS, with text FORMAT, formatted with @@ -79,31 +74,16 @@ tmsg (int class, const char *title, const char *format, ...) void msg (int class, const char *format, ...) { - struct string buf; - - ds_init (NULL, &buf, 1024); + struct error e; + va_list args; - /* Format the message into BUF. */ - { - va_list args; + e.class = class; + err_location (&e.where); + e.title = NULL; - va_start (args, format); - ds_vprintf (&buf, format, args); - va_end (args); - } - - /* Output the message. */ - { - struct error e; - - e.class = class; - err_location (&e.where); - e.title = NULL; - e.text = buf.string; - err_vmsg (&e); - } - - ds_destroy (&buf); + va_start (args, format); + err_vmsg (&e, format, args); + va_end (args); } /* Terminate due to fatal error in input. */ @@ -223,9 +203,15 @@ err_hcf (int success) { terminating = 1; + lex_done(); getl_uninitialize (); + free(file_loc); + file_loc = NULL; + nfile_loc = mfile_loc = 0; + outp_done (); + done_glob(); exit (success ? EXIT_SUCCESS : EXIT_FAILURE); } @@ -235,7 +221,7 @@ static void dump_message (char *errbuf, unsigned indent, void (*func) (const char *), unsigned width); void -err_vmsg (const struct error *e) +err_vmsg (const struct error *e, const char *format, va_list args) { /* Class flags. */ enum @@ -281,15 +267,15 @@ err_vmsg (const struct error *e) class &= ERR_CLASS_MASK; assert (class >= 0 && class < ERR_CLASS_COUNT); - assert (e->text != NULL); + assert (format != NULL); - ds_init (NULL, &msg, 64); + ds_init (&msg, 64); if (e->where.filename && (error_classes[class].flags & ERR_WITH_FILE)) { ds_printf (&msg, "%s:", e->where.filename); if (e->where.line_number != -1) ds_printf (&msg, "%d:", e->where.line_number); - ds_putchar (&msg, ' '); + ds_putc (&msg, ' '); } ds_printf (&msg, "%s: ", gettext (error_classes[class].banner)); @@ -304,9 +290,9 @@ err_vmsg (const struct error *e) ds_printf (&msg, "%s: ", cur_proc); if (e->title) - ds_concat (&msg, e->title); + ds_puts (&msg, e->title); - ds_concat (&msg, e->text); + ds_vprintf (&msg, format, args); /* FIXME: Check set_messages and set_errors to determine where to send errors and messages. @@ -314,7 +300,7 @@ err_vmsg (const struct error *e) Please note that this is not trivial. We have to avoid an infinite loop in reporting errors that originate in the output section. */ - dump_message (ds_value (&msg), 8, puts_stdout, get_viewwidth()); + dump_message (ds_c_str (&msg), 8, puts_stdout, get_viewwidth()); ds_destroy (&msg); @@ -500,11 +486,6 @@ dump_message (char *msg, unsigned indent, void (*func) (const char *), memset (buf, ' ', indent); memcpy (&buf[indent], cp, cp2 - cp); - if ( hard_break) - { - buf[indent + idx + cp2 - cp] = '\n'; - ++idx; - } buf[indent + idx + cp2 - cp] = '\0'; func (buf); cp = cp2; @@ -512,3 +493,62 @@ dump_message (char *msg, unsigned indent, void (*func) (const char *), local_free (buf); } + + +void +request_bug_report_and_abort(const char *msg ) +{ + 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" + "compiler version: %s\n" + , + + bare_version, + version, + stat_version, + host_system, + build_system, + default_config_path, + include_path, + groff_font_path, + locale_dir, +#ifdef __VERSION__ + __VERSION__ +#else + "Unknown" +#endif + ); + + if ( msg ) + fprintf(stderr,"Diagnosis: %s\n",msg); + + fprintf(stderr, + "******************************************************************\n"); + + abort(); +} + +void +err_assert_fail(const char *expr, const char *file, int line) +{ + char msg[256]; + snprintf(msg,256,"Assertion failed: %s:%d; (%s)",file,line,expr); + request_bug_report_and_abort( msg ); +}