projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Quoted strings in generated syntax.
[pspp]
/
src
/
ui
/
terminal
/
msg-ui.c
diff --git
a/src/ui/terminal/msg-ui.c
b/src/ui/terminal/msg-ui.c
index 7cb652c021df77b3b42fe3ab70de9eeb4d7e582a..b63ec25bef38fa6c15277c6748f9ffbecba972db 100644
(file)
--- a/
src/ui/terminal/msg-ui.c
+++ b/
src/ui/terminal/msg-ui.c
@@
-1,6
+1,5
@@
/* PSPP - computes sample statistics.
Copyright (C) 1997-9, 2000, 2006 Free Software Foundation, Inc.
/* PSPP - computes sample statistics.
Copyright (C) 1997-9, 2000, 2006 Free Software Foundation, Inc.
- Written by Ben Pfaff <blp@gnu.org>.
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License as
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License as
@@
-21,7
+20,6
@@
#include "msg-ui.h"
#include "msg-ui.h"
-#include "exit.h"
#include "linebreak.h"
#include <libpspp/msg-locator.h>
#include "linebreak.h"
#include <libpspp/msg-locator.h>
@@
-31,7
+29,7
@@
#include <libpspp/str.h>
#include <errno.h>
#include <stdio.h>
#include <libpspp/str.h>
#include <errno.h>
#include <stdio.h>
-
+#include <stdlib.h>
#include "gettext.h"
#define _(msgid) gettext (msgid)
#include "gettext.h"
#define _(msgid) gettext (msgid)
@@
-53,7
+51,7
@@
msg_ui_set_error_file (const char *filename)
}
void
}
void
-msg_ui_init (
void
)
+msg_ui_init (
struct source_stream *ss
)
{
msg_file = stdout;
{
msg_file = stdout;
@@
-69,25
+67,25
@@
msg_ui_init (void)
msg_file = stdout;
}
}
msg_file = stdout;
}
}
- msg_init (handle_msg);
+ msg_init (
ss,
handle_msg);
}
void
msg_ui_done (void)
{
msg_done ();
}
void
msg_ui_done (void)
{
msg_done ();
+ msg_locator_done ();
if ( msg_file ) /* FIXME: do we really want to close stdout ?? */
fclose (msg_file);
}
if ( msg_file ) /* FIXME: do we really want to close stdout ?? */
fclose (msg_file);
}
-
/* Checks whether we've had so many errors that it's time to quit
processing this syntax file. */
void
/* Checks whether we've had so many errors that it's time to quit
processing this syntax file. */
void
-check_msg_count (
void
)
+check_msg_count (
struct source_stream *ss
)
{
{
- if (!getl_is_interactive ())
+ if (!getl_is_interactive (
ss
))
{
if (get_errorbreak () && error_count)
msg (MN, _("Terminating execution of syntax file due to error."));
{
if (get_errorbreak () && error_count)
msg (MN, _("Terminating execution of syntax file due to error."));
@@
-100,7
+98,7
@@
check_msg_count (void)
else
return;
else
return;
- getl_abort_noninteractive ();
+ getl_abort_noninteractive (
ss
);
}
}
}
}