X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Flibpspp%2Fmessage.c;h=c227a60368a0ff725dacc9baba4e00bf916cf37d;hb=16c70c9f2e041d4ff21f57c29be37e60be40c089;hp=1a4601fc18981b55bf3ed9f1422b1478d872e8ac;hpb=8e018d25310cb53e5339b46e95f0abe02db83782;p=pspp-builds.git diff --git a/src/libpspp/message.c b/src/libpspp/message.c index 1a4601fc..c227a603 100644 --- a/src/libpspp/message.c +++ b/src/libpspp/message.c @@ -1,25 +1,23 @@ -/* 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, 2009, 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 +#include "message.h" +#include "msg-locator.h" #include #include @@ -28,19 +26,18 @@ #include #include -#include +#include #include -#include "progname.h" -#include "xvasprintf.h" +#include "gl/progname.h" +#include "gl/xalloc.h" +#include "gl/xvasprintf.h" -/* Current command name as set by msg_set_command_name(). */ -static char *command_name; +#include "gettext.h" +#define _(msgid) gettext (msgid) /* Message handler as set by msg_init(). */ static void (*msg_handler) (const struct msg *); -static void (*msg_location) (struct msg_locator *); - /* Disables emitting messages if positive. */ static int messages_disabled; @@ -64,47 +61,105 @@ msg (enum msg_class class, const char *format, ...) msg_emit (&m); } +static struct source_stream *s_stream; + void -msg_init ( void (*handler) (const struct msg *), - void (*location) (struct msg_locator *) ) +msg_init (struct source_stream *ss, void (*handler) (const struct msg *) ) { + s_stream = ss; msg_handler = handler; - msg_location = location; } void -msg_done (void) +msg_done (void) { } - + +/* Working with messages. */ /* Duplicate a message */ -struct msg * -msg_dup(const struct msg *m) +struct msg * +msg_dup (const struct msg *m) { - struct msg *new_msg = xmalloc (sizeof *m); + struct msg *new_msg; - *new_msg = *m; - new_msg->text = strdup(m->text); + new_msg = xmemdup (m, sizeof *m); + if (m->where.file_name != NULL) + new_msg->where.file_name = xstrdup (m->where.file_name); + new_msg->text = xstrdup (m->text); return new_msg; } +/* Frees a message created by msg_dup(). + + (Messages not created by msg_dup(), as well as their where.file_name + members, are typically not dynamically allocated, so this function should + not be used to destroy them.) */ void -msg_destroy(struct msg *m) +msg_destroy (struct msg *m) { - free(m->text); - free(m); + free (m->where.file_name); + free (m->text); + free (m); } +char * +msg_to_string (const struct msg *m, const char *command_name) +{ + const char *label; + struct string s; + + ds_init_empty (&s); + + if (m->category != MSG_C_GENERAL + && (m->where.file_name || m->where.line_number != -1)) + { + if (m->where.file_name) + ds_put_format (&s, "%s:", m->where.file_name); + if (m->where.line_number != -1) + ds_put_format (&s, "%d:", m->where.line_number); + ds_put_char (&s, ' '); + } + + switch (m->severity) + { + case MSG_S_ERROR: + label = _("error"); + break; + case MSG_S_WARNING: + label = _("warning"); + break; + case MSG_S_NOTE: + default: + label = _("note"); + break; + } + ds_put_format (&s, "%s: ", label); + + if (m->category == MSG_C_SYNTAX && command_name != NULL) + ds_put_format (&s, "%s: ", command_name); + + ds_put_cstr (&s, m->text); + + return ds_cstr (&s); +} + /* Emits M as an error message. Frees allocated data in M. */ void -msg_emit (struct msg *m) +msg_emit (struct msg *m) { - msg_location (&m->where); + if ( s_stream ) + get_msg_location (s_stream, &m->where); + else + { + m->where.file_name = NULL; + m->where.line_number = -1; + } + if (!messages_disabled) - msg_handler (m); + msg_handler (m); free (m->text); } @@ -113,14 +168,14 @@ msg_emit (struct msg *m) called an equal number of times before messages are actually re-enabled. */ void -msg_disable (void) +msg_disable (void) { messages_disabled++; } /* Enables message output that was disabled by msg_disable. */ void -msg_enable (void) +msg_enable (void) { assert (messages_disabled > 0); messages_disabled--; @@ -128,23 +183,7 @@ msg_enable (void) /* Private functions. */ -/* Sets COMMAND_NAME as the command name included in some kinds - of error messages. */ void -msg_set_command_name (const char *command_name_) -{ - free (command_name); - command_name = command_name_ ? xstrdup (command_name_) : NULL; -} - -/* Returns the current command name, or NULL if none. */ -const char * -msg_get_command_name (void) -{ - return command_name; -} - -void request_bug_report_and_abort (const char *msg) { fprintf (stderr, "******************************************************\n"); @@ -158,8 +197,6 @@ request_bug_report_and_abort (const char *msg) fprintf (stderr, "version: %s\n", stat_version); fprintf (stderr, "host_system: %s\n", host_system); fprintf (stderr, "build_system: %s\n", build_system); - fprintf (stderr, "default_config_path: %s\n", default_config_path); - fprintf (stderr, "include_path: %s\n", include_path); fprintf (stderr, "locale_dir: %s\n", locale_dir); fprintf (stderr, "compiler version: %s\n", #ifdef __VERSION__ @@ -167,7 +204,7 @@ request_bug_report_and_abort (const char *msg) #else "Unknown" #endif - ); + ); fprintf (stderr, "******************************************************\n"); _exit (EXIT_FAILURE);