Merge commit 'origin/stable'

[pspp-builds.git] / src / libpspp / message.c

diff --git a/src/libpspp/message.c b/src/libpspp/message.c
index eaad1a69f3e596d612b7e97eb0a9e547324ae8df..5faee1f1d6c8dc33279e36acc9b3188b56b1f218 100644 (file)
--- a/src/libpspp/message.c
+++ b/src/libpspp/message.c
@@ -1,36 +1,35 @@
-/* PSPP - computes sample statistics.
-   Copyright (C) 1997-9, 2000, 2006 Free Software Foundation, Inc.
-   Written by Ben Pfaff <blp@gnu.org>.
+/* PSPP - a program for statistical analysis.
+   Copyright (C) 1997-9, 2000, 2006, 2009 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 <http://www.gnu.org/licenses/>. */
 
 #include <config.h>
 
-#include <libpspp/message.h>
+#include "message.h"
+#include "msg-locator.h"
 
+#include <assert.h>
 #include <stdarg.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
 
-#include <libpspp/alloc.h>
 #include <libpspp/version.h>
 
 #include "progname.h"
+#include "xalloc.h"
 #include "xvasprintf.h"
 
 /* Current command name as set by msg_set_command_name(). */
@@ -38,8 +37,9 @@ static char *command_name;
 
 /* 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;
 
 /* Public functions. */
 
@@ -60,28 +60,29 @@ 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)
 {
 }
 
 
 /* Duplicate a message */
-struct msg * 
+struct msg *
 msg_dup(const struct msg *m)
 {
   struct msg *new_msg = xmalloc (sizeof *m);
 
   *new_msg = *m;
-  new_msg->text = strdup(m->text);
+  new_msg->text = xstrdup(m->text);
 
   return new_msg;
 }
@@ -93,23 +94,43 @@ msg_destroy(struct msg *m)
   free(m);
 }
 
-
 /* 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);
-  msg_handler (m);
+  if ( s_stream )
+    get_msg_location (s_stream, &m->where);
+
+  if (!messages_disabled)
+     msg_handler (m);
   free (m->text);
 }
+
+/* Disables message output until the next call to msg_enable.  If
+   this function is called multiple times, msg_enable must be
+   called an equal number of times before messages are actually
+   re-enabled. */
+void
+msg_disable (void)
+{
+  messages_disabled++;
+}
+
+/* Enables message output that was disabled by msg_disable. */
+void
+msg_enable (void)
+{
+  assert (messages_disabled > 0);
+  messages_disabled--;
+}
 \f
 /* 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_) 
+msg_set_command_name (const char *command_name_)
 {
   free (command_name);
   command_name = command_name_ ? xstrdup (command_name_) : NULL;
@@ -117,12 +138,12 @@ msg_set_command_name (const char *command_name_)
 
 /* Returns the current command name, or NULL if none. */
 const char *
-msg_get_command_name (void) 
+msg_get_command_name (void)
 {
   return command_name;
 }
 
-void 
+void
 request_bug_report_and_abort (const char *msg)
 {
   fprintf (stderr, "******************************************************\n");
@@ -145,7 +166,7 @@ request_bug_report_and_abort (const char *msg)
 #else
            "Unknown"
 #endif
-           );     
+           );
   fprintf (stderr, "******************************************************\n");
 
   _exit (EXIT_FAILURE);