X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Flibpspp%2Fmessage.c;h=eb441cf4d5e736e81ca1f3d3f1b343d5c743535c;hb=6c8b13da57b074620495a0543bd7944bca574a42;hp=b4214920f46c5f2f7f30362b72955c558bd94519;hpb=6e097c89af440da90b43ce90864394c4d0c843d5;p=pspp

diff --git a/src/libpspp/message.c b/src/libpspp/message.c
index b4214920f4..eb441cf4d5 100644
--- a/src/libpspp/message.c
+++ b/src/libpspp/message.c
@@ -52,14 +52,11 @@ static int messages_disabled;
 void
 vmsg (enum msg_class class, const char *format, va_list args)
 {
-  struct msg m;
-
-  m.category = msg_class_to_category (class);
-  m.severity = msg_class_to_severity (class);
-  m.text = xvasprintf (format, args);
-  m.file_name = NULL;
-  m.first_line = m.last_line = 0;
-  m.first_column = m.last_column = 0;
+  struct msg m = {
+    .category = msg_class_to_category (class),
+    .severity = msg_class_to_severity (class),
+    .text = xvasprintf (format, args),
+  };
 
   msg_emit (&m);
 }
@@ -81,23 +78,19 @@ void
 msg_error (int errnum, const char *format, ...)
 {
   va_list args;
-  char *e;
-  struct msg m;
-
-  m.category = MSG_C_GENERAL;
-  m.severity = MSG_S_ERROR;
-
   va_start (args, format);
-  e = xvasprintf (format, args);
+  char *e = xvasprintf (format, args);
   va_end (args);
 
-  m.file_name = NULL;
-  m.first_line = m.last_line = 0;
-  m.first_column = m.last_column = 0;
-  m.text = xasprintf (_("%s: %s"), e, strerror (errnum));
-  free (e);
-
+  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);
 }
 
 
@@ -135,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;
@@ -150,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;
 
@@ -217,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);
 
@@ -277,7 +273,7 @@ static void
 ship_message (struct msg *m)
 {
   entrances++;
-  if ( ! m->shipped )
+  if (! m->shipped)
     {
       if (msg_handler && entrances <= 1)
 	msg_handler (m, msg_aux);
@@ -294,18 +290,11 @@ ship_message (struct msg *m)
 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;
-  m.shipped = false;
-
+  struct msg m = {
+    .category = MSG_C_GENERAL,
+    .severity = MSG_S_NOTE,
+    .text = s,
+  };
   ship_message (&m);
 
   free (s);
@@ -320,7 +309,7 @@ process_msg (struct msg *m)
 
   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;
 
   ship_message (m);
@@ -363,6 +352,7 @@ msg_emit (struct msg *m)
      process_msg (m);
 
   free (m->text);
+  free (m->command_name);
 }
 
 /* Disables message output until the next call to msg_enable.  If
@@ -385,28 +375,75 @@ msg_enable (void)
 
 /* Private functions. */
 
-void
-request_bug_report (const char *msg)
+static char fatal_error_message[1024];
+static int fatal_error_message_bytes = 0;
+
+static char diagnostic_information[1024];
+static int diagnostic_information_bytes = 0;
+
+static int
+append_message (char *msg, int bytes_used, const char *fmt, ...)
+{
+  va_list va;
+  va_start (va, fmt);
+  int ret = vsnprintf (msg + bytes_used, 1024 - bytes_used, fmt, va);
+  va_end (va);
+  assert (ret >= 0);
+
+  return ret;
+}
+
+
+/* Generate a row of asterisks held in statically allocated memory  */
+static struct substring
+generate_banner (void)
+{
+  static struct substring banner;
+  if (!banner.string)
+    banner = ss_cstr ("******************************************************\n");
+  return banner;
+}
+
+const char *
+prepare_fatal_error_message (void)
 {
-  fprintf (stderr, "******************************************************\n");
-  fprintf (stderr, "You have discovered a bug in PSPP.  Please report this\n");
-  fprintf (stderr, "to " PACKAGE_BUGREPORT ".  Please include this entire\n");
-  fprintf (stderr, "message, *plus* several lines of output just above it.\n");
-  fprintf (stderr, "For the best chance at having the bug fixed, also\n");
-  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", 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);
-  fprintf (stderr, "compiler version:    %s\n",
+  fatal_error_message_bytes += append_message (fatal_error_message, fatal_error_message_bytes, generate_banner ().string);
+
+  fatal_error_message_bytes += append_message (fatal_error_message, fatal_error_message_bytes, "You have discovered a bug in PSPP.  Please report this\n");
+  fatal_error_message_bytes += append_message (fatal_error_message, fatal_error_message_bytes, "to " PACKAGE_BUGREPORT ".  Please include this entire\n");
+  fatal_error_message_bytes += append_message (fatal_error_message, fatal_error_message_bytes, "message, *plus* several lines of output just above it.\n");
+  fatal_error_message_bytes += append_message (fatal_error_message, fatal_error_message_bytes, "For the best chance at having the bug fixed, also\n");
+  fatal_error_message_bytes += append_message (fatal_error_message, fatal_error_message_bytes, "include the syntax file that triggered it and a sample\n");
+  fatal_error_message_bytes += append_message (fatal_error_message, fatal_error_message_bytes, "of any data file used for input.\n");
+  return fatal_error_message;
+}
+
+const char *
+prepare_diagnostic_information (void)
+{
+  diagnostic_information_bytes += append_message (diagnostic_information, diagnostic_information_bytes, "version:             %s\n", version);
+  diagnostic_information_bytes += append_message (diagnostic_information, diagnostic_information_bytes, "host_system:         %s\n", host_system);
+  diagnostic_information_bytes += append_message (diagnostic_information, diagnostic_information_bytes, "build_system:        %s\n", build_system);
+  diagnostic_information_bytes += append_message (diagnostic_information, diagnostic_information_bytes, "locale_dir:          %s\n", locale_dir);
+  diagnostic_information_bytes += append_message (diagnostic_information, diagnostic_information_bytes, "compiler version:    %s\n",
 #ifdef __VERSION__
            __VERSION__
 #else
            "Unknown"
 #endif
-           );
-  fprintf (stderr, "******************************************************\n");
+);
+
+  return diagnostic_information;
 }
 
+void
+request_bug_report (const char *msg)
+{
+  write (STDERR_FILENO, fatal_error_message, fatal_error_message_bytes);
+  write (STDERR_FILENO, "proximate cause:     ", 21);
+  write (STDERR_FILENO, msg, strlen (msg));
+  write (STDERR_FILENO, "\n", 1);
+  write (STDERR_FILENO, diagnostic_information, diagnostic_information_bytes);
+  const struct substring banner = generate_banner ();
+  write (STDERR_FILENO, banner.string, banner.length);
+}