X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Flibpspp%2Fmessage.c;h=2a2f543f7e95cedec2680f64d55d4cc7262af369;hb=0fc606c52d7cec253af9b7463b15baabfbc9a33a;hp=4d95ba43acb61e522c84ec2e2b775ba430ab9146;hpb=27e94a1fb74828d4289110ad8b66e8b3eb8bc55e;p=pspp

diff --git a/src/libpspp/message.c b/src/libpspp/message.c
index 4d95ba43ac..2a2f543f7e 100644
--- a/src/libpspp/message.c
+++ b/src/libpspp/message.c
@@ -1,5 +1,6 @@
 /* PSPP - a program for statistical analysis.
-   Copyright (C) 1997-9, 2000, 2006, 2009, 2010, 2011 Free Software Foundation, Inc.
+   Copyright (C) 1997-9, 2000, 2006, 2009, 2010,
+   2011, 2013 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
@@ -47,26 +48,53 @@ static int messages_disabled;
 
 /* Public functions. */
 
+
+void
+vmsg (enum msg_class class, const char *format, va_list args)
+{
+  struct msg m = {
+    .category = msg_class_to_category (class),
+    .severity = msg_class_to_severity (class),
+    .text = xvasprintf (format, args),
+  };
+
+  msg_emit (&m);
+}
+
 /* Writes error message in CLASS, with text FORMAT, formatted with
    printf, to the standard places. */
 void
 msg (enum msg_class class, const char *format, ...)
 {
-  struct msg m;
   va_list args;
+  va_start (args, format);
+  vmsg (class, format, args);
+  va_end (args);
+}
+
+
 
-  m.category = msg_class_to_category (class);
-  m.severity = msg_class_to_severity (class);
+void
+msg_error (int errnum, const char *format, ...)
+{
+  va_list args;
   va_start (args, format);
-  m.text = xvasprintf (format, args);
-  m.file_name = NULL;
-  m.first_line = m.last_line = 0;
-  m.first_column = m.last_column = 0;
+  char *e = xvasprintf (format, args);
   va_end (args);
 
+  struct msg m = {
+    .category = MSG_C_GENERAL,
+    .severity = MSG_S_ERROR,
+    .file_name = NULL,
+    .text = xasprintf (_("%s: %s"), e, strerror (errnum)),
+  };
   msg_emit (&m);
+
+  free (e);
 }
 
+
+
 void
 msg_set_handler (void (*handler) (const struct msg *, void *aux), void *aux)
 {
@@ -100,6 +128,8 @@ msg_dup (const struct msg *m)
   new_msg = xmemdup (m, sizeof *m);
   if (m->file_name != NULL)
     new_msg->file_name = xstrdup (m->file_name);
+  if (m->command_name != NULL)
+    new_msg->command_name = xstrdup (m->command_name);
   new_msg->text = xstrdup (m->text);
 
   return new_msg;
@@ -115,11 +145,12 @@ msg_destroy (struct msg *m)
 {
   free (m->file_name);
   free (m->text);
+  free (m->command_name);
   free (m);
 }
 
 char *
-msg_to_string (const struct msg *m, const char *command_name)
+msg_to_string (const struct msg *m)
 {
   struct string s;
 
@@ -182,8 +213,8 @@ msg_to_string (const struct msg *m, const char *command_name)
 
   ds_put_format (&s, "%s: ", msg_severity_to_string (m->severity));
 
-  if (m->category == MSG_C_SYNTAX && command_name != NULL)
-    ds_put_format (&s, "%s: ", command_name);
+  if (m->category == MSG_C_SYNTAX && m->command_name != NULL)
+    ds_put_format (&s, "%s: ", m->command_name);
 
   ds_put_cstr (&s, m->text);
 
@@ -235,37 +266,53 @@ msg_ui_any_errors (void)
   return counts[MSG_S_ERROR] > 0;
 }
 
+
+static int entrances = 0;
+
+static void
+ship_message (struct msg *m)
+{
+  entrances++;
+  if (! m->shipped)
+    {
+      if (msg_handler && entrances <= 1)
+	msg_handler (m, msg_aux);
+      else
+	{
+	  fwrite (m->text, 1, strlen (m->text), stderr);
+	  fwrite ("\n", 1, 1, stderr);
+	}
+    }
+  m->shipped = true;
+  entrances--;
+}
+
 static void
 submit_note (char *s)
 {
-  struct msg m;
-
-  m.category = MSG_C_GENERAL;
-  m.severity = MSG_S_NOTE;
-  m.file_name = NULL;
-  m.first_line = 0;
-  m.last_line = 0;
-  m.first_column = 0;
-  m.last_column = 0;
-  m.text = s;
-  msg_handler (&m, msg_aux);
+  struct msg m = {
+    .category = MSG_C_GENERAL,
+    .severity = MSG_S_NOTE,
+    .text = s,
+  };
+  ship_message (&m);
+
   free (s);
 }
 
 
 
 static void
-process_msg (const struct msg *m)
+process_msg (struct msg *m)
 {
   int n_msgs, max_msgs;
 
-
   if (too_many_errors
       || (too_many_notes && m->severity == MSG_S_NOTE)
-      || (warnings_off && m->severity == MSG_S_WARNING) )
+      || (warnings_off && m->severity == MSG_S_WARNING))
     return;
 
-  msg_handler (m, msg_aux);
+  ship_message (m);
 
   counts[m->severity]++;
   max_msgs = settings_get_max_messages (m->severity);
@@ -300,10 +347,12 @@ process_msg (const struct msg *m)
 void
 msg_emit (struct msg *m)
 {
+  m->shipped = false;
   if (!messages_disabled)
      process_msg (m);
 
   free (m->text);
+  free (m->command_name);
 }
 
 /* Disables message output until the next call to msg_enable.  If
@@ -337,7 +386,7 @@ request_bug_report (const char *msg)
   fprintf (stderr, "include the syntax file that triggered it and a sample\n");
   fprintf (stderr, "of any data file used for input.\n");
   fprintf (stderr, "proximate cause:     %s\n", msg);
-  fprintf (stderr, "version:             %s\n", stat_version);
+  fprintf (stderr, "version:             %s\n", version);
   fprintf (stderr, "host_system:         %s\n", host_system);
   fprintf (stderr, "build_system:        %s\n", build_system);
   fprintf (stderr, "locale_dir:          %s\n", locale_dir);
@@ -347,7 +396,7 @@ request_bug_report (const char *msg)
 #else
            "Unknown"
 #endif
-           );
+);
   fprintf (stderr, "******************************************************\n");
 }