projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix leaks in MEANS command
[pspp]
/
src
/
language
/
data-io
/
data-list.c
diff --git
a/src/language/data-io/data-list.c
b/src/language/data-io/data-list.c
index 043b424db77a6e3303fd845438ef8ff2911f164c..17c6032d252b97181864f43e4158900b071316fe 100644
(file)
--- a/
src/language/data-io/data-list.c
+++ b/
src/language/data-io/data-list.c
@@
-1,5
+1,5
@@
/* PSPP - a program for statistical analysis.
/* PSPP - a program for statistical analysis.
- Copyright (C) 1997-9, 2000, 2006, 2007, 2009, 2010, 2011 Free Software Foundation, Inc.
+ Copyright (C) 1997-9, 2000, 2006, 2007, 2009, 2010, 2011
, 2012
Free Software Foundation, Inc.
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@
-25,9
+25,9
@@
#include "data/case.h"
#include "data/casereader.h"
#include "data/data-in.h"
#include "data/case.h"
#include "data/casereader.h"
#include "data/data-in.h"
+#include "data/dataset.h"
#include "data/dictionary.h"
#include "data/format.h"
#include "data/dictionary.h"
#include "data/format.h"
-#include "data/procedure.h"
#include "data/settings.h"
#include "data/transformations.h"
#include "data/variable.h"
#include "data/settings.h"
#include "data/transformations.h"
#include "data/variable.h"
@@
-42,6
+42,7
@@
#include "language/lexer/variable-parser.h"
#include "libpspp/assertion.h"
#include "libpspp/compiler.h"
#include "language/lexer/variable-parser.h"
#include "libpspp/assertion.h"
#include "libpspp/compiler.h"
+#include "libpspp/i18n.h"
#include "libpspp/message.h"
#include "libpspp/misc.h"
#include "libpspp/pool.h"
#include "libpspp/message.h"
#include "libpspp/misc.h"
#include "libpspp/pool.h"
@@
-77,7
+78,7
@@
cmd_data_list (struct lexer *lexer, struct dataset *ds)
struct dfm_reader *reader;
struct variable *end = NULL;
struct file_handle *fh = NULL;
struct dfm_reader *reader;
struct variable *end = NULL;
struct file_handle *fh = NULL;
-
struct string encoding = DS_EMPTY_INITIALIZER
;
+
char *encoding = NULL
;
int table;
enum data_parser_type type;
int table;
enum data_parser_type type;
@@
-85,7
+86,9
@@
cmd_data_list (struct lexer *lexer, struct dataset *ds)
struct pool *tmp_pool;
bool ok;
struct pool *tmp_pool;
bool ok;
- dict = in_input_program () ? dataset_dict (ds) : dict_create ();
+ dict = (in_input_program ()
+ ? dataset_dict (ds)
+ : dict_create (get_default_encoding ()));
parser = data_parser_create (dict);
reader = NULL;
parser = data_parser_create (dict);
reader = NULL;
@@
-98,7
+101,7
@@
cmd_data_list (struct lexer *lexer, struct dataset *ds)
{
lex_match (lexer, T_EQUALS);
fh_unref (fh);
{
lex_match (lexer, T_EQUALS);
fh_unref (fh);
- fh = fh_parse (lexer, FH_REF_FILE | FH_REF_INLINE);
+ fh = fh_parse (lexer, FH_REF_FILE | FH_REF_INLINE
, NULL
);
if (fh == NULL)
goto error;
}
if (fh == NULL)
goto error;
}
@@
-108,7
+111,8
@@
cmd_data_list (struct lexer *lexer, struct dataset *ds)
if (!lex_force_string (lexer))
goto error;
if (!lex_force_string (lexer))
goto error;
- ds_init_substring (&encoding, lex_tokss (lexer));
+ free (encoding);
+ encoding = ss_xstrdup (lex_tokss (lexer));
lex_get (lexer);
}
lex_get (lexer);
}
@@
-204,6
+208,7
@@
cmd_data_list (struct lexer *lexer, struct dataset *ds)
}
else
{
}
else
{
+ /* XXX should support multibyte UTF-8 characters */
lex_error (lexer, NULL);
ds_destroy (&delims);
goto error;
lex_error (lexer, NULL);
ds_destroy (&delims);
goto error;
@@
-237,13
+242,9
@@
cmd_data_list (struct lexer *lexer, struct dataset *ds)
}
type = data_parser_get_type (parser);
}
type = data_parser_get_type (parser);
- if (! ds_is_empty (&encoding))
- {
- if ( NULL == fh)
- msg (MW, _("Encoding should not be specified for inline data. It will be ignored."));
- else
- dict_set_encoding (dict, ds_cstr (&encoding));
- }
+ if (encoding && NULL == fh)
+ msg (MW, _("Encoding should not be specified for inline data. It will be "
+ "ignored."));
if (fh == NULL)
fh = fh_inline_file ();
if (fh == NULL)
fh = fh_inline_file ();
@@
-278,7
+279,7
@@
cmd_data_list (struct lexer *lexer, struct dataset *ds)
if (table)
data_parser_output_description (parser, fh);
if (table)
data_parser_output_description (parser, fh);
- reader = dfm_open_reader (fh, lexer);
+ reader = dfm_open_reader (fh, lexer
, encoding
);
if (reader == NULL)
goto error;
if (reader == NULL)
goto error;
@@
-294,7
+295,7
@@
cmd_data_list (struct lexer *lexer, struct dataset *ds)
data_parser_make_active_file (parser, ds, reader, dict);
fh_unref (fh);
data_parser_make_active_file (parser, ds, reader, dict);
fh_unref (fh);
-
ds_destroy (&
encoding);
+
free (
encoding);
return CMD_SUCCESS;
return CMD_SUCCESS;
@@
-303,7
+304,7
@@
cmd_data_list (struct lexer *lexer, struct dataset *ds)
if (!in_input_program ())
dict_destroy (dict);
fh_unref (fh);
if (!in_input_program ())
dict_destroy (dict);
fh_unref (fh);
-
ds_destroy (&
encoding);
+
free (
encoding);
return CMD_CASCADING_FAILURE;
}
\f
return CMD_CASCADING_FAILURE;
}
\f
@@
-330,9
+331,9
@@
parse_fixed (struct lexer *lexer, struct dictionary *dict,
/* Parse everything. */
if (!parse_record_placement (lexer, &record, &column)
/* Parse everything. */
if (!parse_record_placement (lexer, &record, &column)
- || !parse_DATA_LIST_vars_pool (lexer, tmp_pool,
+ || !parse_DATA_LIST_vars_pool (lexer,
dict,
tmp_pool,
&names, &name_cnt, PV_NONE)
&names, &name_cnt, PV_NONE)
- || !parse_var_placements (lexer, tmp_pool, name_cnt,
true
,
+ || !parse_var_placements (lexer, tmp_pool, name_cnt,
FMT_FOR_INPUT
,
&formats, &format_cnt))
return false;
&formats, &format_cnt))
return false;
@@
-422,7
+423,7
@@
parse_free (struct lexer *lexer, struct dictionary *dict,
size_t name_cnt;
size_t i;
size_t name_cnt;
size_t i;
- if (!parse_DATA_LIST_vars_pool (lexer, tmp_pool,
+ if (!parse_DATA_LIST_vars_pool (lexer,
dict,
tmp_pool,
&name, &name_cnt, PV_NONE))
return false;
&name, &name_cnt, PV_NONE))
return false;