#include "msg-ui.h"
-#include "linebreak.h"
+#include "unilbrk.h"
+#include "localcharset.h"
#include <libpspp/msg-locator.h>
#include <libpspp/getl.h>
#include <libpspp/message.h>
#include <libpspp/str.h>
#include <output/journal.h>
+#include <output/output.h>
+#include <output/table.h>
#include <errno.h>
#include <stdio.h>
#include <stdlib.h>
+#include <unistd.h>
#include "gettext.h"
#define _(msgid) gettext (msgid)
{
if (!getl_is_interactive (ss))
{
- if (get_errorbreak () && error_count)
+ if (settings_get_errorbreak () && error_count)
msg (MN, _("Terminating execution of syntax file due to error."));
- else if (error_count > get_mxerrs() )
+ else if (error_count > settings_get_mxerrs () )
msg (MN, _("Errors (%d) exceeds limit (%d)."),
- error_count, get_mxerrs());
- else if (error_count + warning_count > get_mxwarns() )
+ error_count, settings_get_mxerrs ());
+ else if (error_count + warning_count > settings_get_mxwarns () )
msg (MN, _("Warnings (%d) exceed limit (%d)."),
- error_count + warning_count, get_mxwarns() );
+ error_count + warning_count, settings_get_mxwarns () );
else
return;
ds_put_cstr (&string, m->text);
- if (msg_file != stdout || get_error_routing_to_terminal ())
- dump_message (ds_cstr (&string), get_viewwidth (), 8,
+ if (msg_file != stdout || settings_get_error_routing_to_terminal ())
+ dump_message (ds_cstr (&string),
+ isatty (fileno (msg_file)) ? settings_get_viewwidth () : INT_MAX, 8,
write_stream, msg_file);
dump_message (ds_cstr (&string), 78, 0, write_journal, NULL);
+ if (settings_get_error_routing_to_listing ())
+ {
+ /* Disable screen output devices, because the error should
+ already have been reported to the screen with the
+ dump_message call above. */
+ outp_enable_device (false, OUTP_DEV_SCREEN);
+ tab_output_text (TAB_LEFT, ds_cstr (&string));
+ outp_enable_device (true, OUTP_DEV_SCREEN);
+ }
+
ds_destroy (&string);
}
/* Break into lines. */
if (indent > width / 3)
indent = width / 3;
- mbs_width_linebreaks (string, length,
+ ulc_width_linebreaks (string, length,
width - indent, -indent, 0,
NULL, locale_charset (), breaks);
/* Writes LINE to the journal. */
static void
-write_journal (int line_indent, struct substring line, void *unused UNUSED)
+write_journal (int line_indent UNUSED, struct substring line, void *unused UNUSED)
{
char *s = xstrndup (ss_data (line), ss_length (line));
journal_write (true, s);