projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fixed error running 'make distcheck'
[pspp]
/
src
/
language
/
data-io
/
print-space.c
diff --git
a/src/language/data-io/print-space.c
b/src/language/data-io/print-space.c
index edaf13e769e42c8a6e20c72a617e4c4f3243f802..555cdfa405031dde23a81f4e6f3a87a5643a5649 100644
(file)
--- a/
src/language/data-io/print-space.c
+++ b/
src/language/data-io/print-space.c
@@
-51,6
+51,7
@@
cmd_print_space (struct lexer *lexer, struct dataset *ds)
struct file_handle *handle = NULL;
struct expression *expr = NULL;
struct dfm_writer *writer;
struct file_handle *handle = NULL;
struct expression *expr = NULL;
struct dfm_writer *writer;
+ char *encoding = NULL;
if (lex_match_id (lexer, "OUTFILE"))
{
if (lex_match_id (lexer, "OUTFILE"))
{
@@
-59,6
+60,17
@@
cmd_print_space (struct lexer *lexer, struct dataset *ds)
handle = fh_parse (lexer, FH_REF_FILE, NULL);
if (handle == NULL)
return CMD_FAILURE;
handle = fh_parse (lexer, FH_REF_FILE, NULL);
if (handle == NULL)
return CMD_FAILURE;
+
+ if (lex_match_id (lexer, "ENCODING"))
+ {
+ lex_match (lexer, T_EQUALS);
+ if (!lex_force_string (lexer))
+ goto error;
+
+ encoding = ss_xstrdup (lex_tokss (lexer));
+
+ lex_get (lexer);
+ }
}
else
handle = NULL;
}
else
handle = NULL;
@@
-77,7
+89,7
@@
cmd_print_space (struct lexer *lexer, struct dataset *ds)
if (handle != NULL)
{
if (handle != NULL)
{
- writer = dfm_open_writer (handle);
+ writer = dfm_open_writer (handle
, encoding
);
if (writer == NULL)
goto error;
}
if (writer == NULL)
goto error;
}
@@
-112,19
+124,19
@@
print_space_trns_proc (void *t_, struct ccase **c,
{
double f = expr_evaluate_num (trns->expr, *c, case_num);
if (f == SYSMIS)
{
double f = expr_evaluate_num (trns->expr, *c, case_num);
if (f == SYSMIS)
- msg (SW, _("The expression on
PRINT SPACE
evaluated to the "
- "system-missing value."));
+ msg (SW, _("The expression on
%s
evaluated to the "
+ "system-missing value.")
, "PRINT SPACE"
);
else if (f < 0 || f > INT_MAX)
else if (f < 0 || f > INT_MAX)
- msg (SW, _("The expression on
PRINT SPACE evaluated to %g.")
, f);
+ msg (SW, _("The expression on
%s evaluated to %g."), "PRINT SPACE"
, f);
else
n = f;
}
while (n--)
if (trns->writer == NULL)
else
n = f;
}
while (n--)
if (trns->writer == NULL)
- text_item_submit (text_item_create (TEXT_ITEM_
BLANK_LINE
, ""));
+ text_item_submit (text_item_create (TEXT_ITEM_
LOG
, ""));
else
else
- dfm_put_record (trns->writer, " ", 1);
+ dfm_put_record (trns->writer, " ", 1);
/* XXX */
if (trns->writer != NULL && dfm_write_error (trns->writer))
return TRNS_ERROR;
if (trns->writer != NULL && dfm_write_error (trns->writer))
return TRNS_ERROR;