X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fterminal%2Fmsg-ui.c;h=c657f096f3c16d9679f3bfafff44fa57017d2994;hb=ddb7b52128d8f1f54d9632dc3a15c7869e0fbcce;hp=7d5cf72f84ff89fb689136ad820eb68c96477106;hpb=f5574c6264163859a8eb94ab1e33bcc1b61fce5f;p=pspp-builds.git diff --git a/src/ui/terminal/msg-ui.c b/src/ui/terminal/msg-ui.c index 7d5cf72f..c657f096 100644 --- a/src/ui/terminal/msg-ui.c +++ b/src/ui/terminal/msg-ui.c @@ -1,249 +1,142 @@ -/* PSPP - computes sample statistics. - Copyright (C) 1997-9, 2000, 2006 Free Software Foundation, Inc. - Written by Ben Pfaff . +/* PSPP - a program for statistical analysis. + Copyright (C) 1997-9, 2000, 2006, 2010 Free Software Foundation, Inc. - This program is free software; you can redistribute it and/or - modify it under the terms of the GNU General Public License as - published by the Free Software Foundation; either version 2 of the - License, or (at your option) any later version. + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. - This program is distributed in the hope that it will be useful, but - WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. 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., 51 Franklin Street, Fifth Floor, Boston, MA - 02110-1301, USA. */ + along with this program. If not, see . */ #include -#include "msg-ui.h" +#include "ui/terminal/msg-ui.h" -#include "exit.h" -#include "linebreak.h" - -#include -#include -#include #include +#include +#include +#include +#include + +#include "data/settings.h" +#include "libpspp/getl.h" +#include "libpspp/message.h" +#include "libpspp/msg-locator.h" +#include "libpspp/str.h" +#include "output/journal.h" +#include "output/driver.h" +#include "output/tab.h" +#include "output/message-item.h" + +#include "gl/unilbrk.h" +#include "gl/localcharset.h" #include "gettext.h" #define _(msgid) gettext (msgid) #define N_(msgid) msgid -/* Number of errors, warnings reported. */ -static int error_count; -static int warning_count; -static const char *error_file; +/* Number of messages reported, by severity level. */ +static int counts[MSG_N_SEVERITIES]; -static void handle_msg (const struct msg *); +/* True after the maximum number of errors or warnings has been exceeded. */ +static bool too_many_errors; -static FILE *msg_file; +/* True after the maximum number of notes has been exceeded. */ +static bool too_many_notes; -void -msg_ui_set_error_file (const char *filename) -{ - error_file = filename; -} +static void handle_msg (const struct msg *); void -msg_ui_init (void) +msg_ui_init (struct source_stream *ss) { - msg_file = stdout; - - if ( error_file ) - { - msg_file = fopen (error_file, "a"); - if ( NULL == msg_file ) - { - int err = errno; - printf ( _("Cannot open %s (%s). " - "Writing errors to stdout instead.\n"), - error_file, strerror(err) ); - msg_file = stdout; - } - } - msg_init (handle_msg, get_msg_location); + msg_init (ss, handle_msg); } void -msg_ui_done (void) +msg_ui_done (void) { msg_done (); - fclose (msg_file); + msg_locator_done (); } - /* Checks whether we've had so many errors that it's time to quit processing this syntax file. */ -void -check_msg_count (void) +bool +msg_ui_too_many_errors (void) { - if (!getl_is_interactive ()) - { - if (get_errorbreak () && error_count) - msg (MN, _("Terminating execution of syntax file due to error.")); - else if (error_count > get_mxerrs() ) - msg (MN, _("Errors (%d) exceeds limit (%d)."), - error_count, get_mxerrs()); - else if (error_count + warning_count > get_mxwarns() ) - msg (MN, _("Warnings (%d) exceed limit (%d)."), - error_count + warning_count, get_mxwarns() ); - else - return; - - getl_abort_noninteractive (); - } + return too_many_errors; } void -reset_msg_count (void) +msg_ui_reset_counts (void) { - error_count = warning_count = 0; + int i; + + for (i = 0; i < MSG_N_SEVERITIES; i++) + counts[i] = 0; + too_many_errors = false; + too_many_notes = false; } bool -any_errors (void) +msg_ui_any_errors (void) { - return error_count > 0; + return counts[MSG_S_ERROR] > 0; } - -static void dump_message (char *msg, unsigned width, unsigned indent, FILE *); -static void dump_line (int line_indent, const char *line, size_t length, - FILE *); static void -handle_msg (const struct msg *m) +submit_note (char *s) { - struct category - { - bool show_command_name; /* Show command name with error? */ - bool show_file_location; /* Show syntax file location? */ - }; - - static const struct category categories[] = - { - {false, false}, /* MSG_GENERAL. */ - {true, true}, /* MSG_SYNTAX. */ - {false, true}, /* MSG_DATA. */ - }; - - struct severity - { - const char *name; /* How to identify this severity. */ - int *count; /* Number of msgs with this severity so far. */ - }; - - static struct severity severities[] = - { - {N_("error"), &error_count}, /* MSG_ERROR. */ - {N_("warning"), &warning_count}, /* MSG_WARNING. */ - {NULL, NULL}, /* MSG_NOTE. */ - }; - - const struct category *category = &categories[m->category]; - const struct severity *severity = &severities[m->severity]; - struct string string = DS_EMPTY_INITIALIZER; - - if (category->show_file_location && m->where.file_name) - { - ds_put_format (&string, "%s:", m->where.file_name); - if (m->where.line_number != -1) - ds_put_format (&string, "%d:", m->where.line_number); - ds_put_char (&string, ' '); - } - - if (severity->name != NULL) - ds_put_format (&string, "%s: ", gettext (severity->name)); - - if (severity->count != NULL) - ++*severity->count; - - if (category->show_command_name && msg_get_command_name () != NULL) - ds_put_format (&string, "%s: ", msg_get_command_name ()); - - ds_put_cstr (&string, m->text); - - if (msg_file != stdout || get_error_routing_to_terminal ()) - dump_message (ds_cstr (&string), get_viewwidth (), 8, msg_file); - - ds_destroy (&string); + struct msg m; + + m.category = MSG_C_GENERAL; + m.severity = MSG_S_NOTE; + m.where.file_name = NULL; + m.where.line_number = -1; + m.text = s; + message_item_submit (message_item_create (&m)); + free (s); } -/* Divides MSG into lines of WIDTH width for the first line and - WIDTH - INDENT width for each succeeding line, and writes the - lines to STREAM. */ static void -dump_message (char *msg, unsigned width, unsigned indent, FILE *stream) +handle_msg (const struct msg *m) { - size_t length = strlen (msg); - char *string, *breaks; - int line_indent; - size_t line_start, i; - - /* Allocate temporary buffers. - If we can't get memory for them, then just dump the whole - message. */ - string = strdup (msg); - breaks = malloc (length); - if (string == NULL || breaks == NULL) - { - free (string); - free (breaks); - fputs (msg, stream); - putc ('\n', stream); - return; - } + int n_msgs, max_msgs; - /* Break into lines. */ - if (indent > width / 3) - indent = width / 3; - mbs_width_linebreaks (string, length, - width - indent, -indent, 0, - NULL, locale_charset (), breaks); - - /* Write out lines. */ - line_start = 0; - line_indent = 0; - for (i = 0; i < length; i++) - switch (breaks[i]) - { - case UC_BREAK_POSSIBLE: - /* Break before this character, - and include this character in the next line. */ - dump_line (line_indent, &string[line_start], i - line_start, stream); - line_start = i; - line_indent = indent; - break; - case UC_BREAK_MANDATORY: - /* Break before this character, - but don't include this character in the next line - (because it'string a new-line). */ - dump_line (line_indent, &string[line_start], i - line_start, stream); - line_start = i + 1; - line_indent = indent; - break; - default: - break; - } - if (line_start < length) - dump_line (line_indent, &string[line_start], length - line_start, stream); - - free (string); - free (breaks); -} + if (too_many_errors || (too_many_notes && m->severity == MSG_S_NOTE)) + return; -/* Write LINE_INDENT spaces, the LENGTH characters in LINE, then - a new-line to STREAM. */ -static void -dump_line (int line_indent, const char *line, size_t length, FILE *stream) -{ - int i; - for (i = 0; i < line_indent; i++) - putc (' ', stream); - fwrite (line, 1, length, stream); - putc ('\n', stream); -} + message_item_submit (message_item_create (m)); + counts[m->severity]++; + max_msgs = settings_get_max_messages (m->severity); + n_msgs = counts[m->severity]; + if (m->severity == MSG_S_WARNING) + n_msgs += counts[MSG_S_ERROR]; + if (n_msgs > max_msgs) + { + if (m->severity == MSG_S_NOTE) + { + too_many_notes = true; + submit_note (xasprintf (_("Notes (%d) exceed limit (%d). " + "Suppressing further notes."), + n_msgs, max_msgs)); + } + else + { + too_many_errors = true; + if (m->severity == MSG_S_WARNING) + submit_note (xasprintf (_("Warnings (%d) exceed limit (%d)."), + n_msgs, max_msgs)); + else + submit_note (xasprintf (_("Errors (%d) exceed limit (%d)."), + n_msgs, max_msgs)); + } + } +}