#include "gl/minmax.h"
#include "gl/progname.h"
+#include "gl/relocatable.h"
#include "gl/xalloc.h"
#include "gl/xvasprintf.h"
}
-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--;
+ enum { MAX_STACK = 4 };
+ static struct msg *stack[MAX_STACK];
+ static size_t n;
+
+ /* If we're recursing on a given message, or recursing deeply, drop it. */
+ if (n >= MAX_STACK)
+ return;
+ for (size_t i = 0; i < n; i++)
+ if (stack[i] == m)
+ return;
+
+ stack[n++] = m;
+ if (msg_handler && n <= 1)
+ msg_handler (m, msg_aux);
+ else
+ fprintf (stderr, "%s\n", m->text);
+ n--;
}
static void
void
msg_emit (struct msg *m)
{
- m->shipped = false;
if (!messages_disabled)
process_msg (m);
\f
/* 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)
+{
+ 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)
{
- 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",
+ 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", relocate (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);
+}