projects
/
pspp-builds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
GET DATA /TYPE=TXT: Get rid of VAR_NAME_LEN limit on variable names.
[pspp-builds.git]
/
src
/
language
/
data-io
/
get-data.c
diff --git
a/src/language/data-io/get-data.c
b/src/language/data-io/get-data.c
index c3e842211dd95ac3bd06262cdeeab97cc0f84b38..cb57ad46897749c3f56c607802274a2a09198b41 100644
(file)
--- a/
src/language/data-io/get-data.c
+++ b/
src/language/data-io/get-data.c
@@
-1,5
+1,5
@@
/* PSPP - a program for statistical analysis.
/* PSPP - a program for statistical analysis.
- Copyright (C) 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
+ Copyright (C) 2007, 2008, 2009, 2010
, 2011
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
@@
-274,6
+274,7
@@
parse_get_txt (struct lexer *lexer, struct dataset *ds)
struct dictionary *dict = dict_create ();
struct file_handle *fh = NULL;
struct dfm_reader *reader = NULL;
struct dictionary *dict = dict_create ();
struct file_handle *fh = NULL;
struct dfm_reader *reader = NULL;
+ char *name = NULL;
int record;
enum data_parser_type type;
int record;
enum data_parser_type type;
@@
-465,15
+466,13
@@
parse_get_txt (struct lexer *lexer, struct dataset *ds)
}
lex_match (lexer, T_EQUALS);
}
lex_match (lexer, T_EQUALS);
-
record = 1;
type = data_parser_get_type (parser);
do
{
record = 1;
type = data_parser_get_type (parser);
do
{
- char name[VAR_NAME_LEN + 1];
struct fmt_spec input, output;
struct fmt_spec input, output;
- int fc, lc;
struct variable *v;
struct variable *v;
+ int fc, lc;
while (type == DP_FIXED && lex_match (lexer, T_SLASH))
{
while (type == DP_FIXED && lex_match (lexer, T_SLASH))
{
@@
-502,7
+501,7
@@
parse_get_txt (struct lexer *lexer, struct dataset *ds)
if (!lex_force_id (lexer))
goto error;
if (!lex_force_id (lexer))
goto error;
-
strcpy (name,
lex_tokcstr (lexer));
+
name = xstrdup (
lex_tokcstr (lexer));
lex_get (lexer);
if (type == DP_DELIMITED)
lex_get (lexer);
if (type == DP_DELIMITED)
@@
-539,6
+538,8
@@
parse_get_txt (struct lexer *lexer, struct dataset *ds)
else
data_parser_add_fixed_field (parser, &input, var_get_case_index (v),
name, record, fc);
else
data_parser_add_fixed_field (parser, &input, var_get_case_index (v),
name, record, fc);
+ free (name);
+ name = NULL;
}
while (lex_token (lexer) != T_ENDCMD);
}
while (lex_token (lexer) != T_ENDCMD);
@@
-554,5
+555,6
@@
parse_get_txt (struct lexer *lexer, struct dataset *ds)
data_parser_destroy (parser);
dict_destroy (dict);
fh_unref (fh);
data_parser_destroy (parser);
dict_destroy (dict);
fh_unref (fh);
+ free (name);
return CMD_CASCADING_FAILURE;
}
return CMD_CASCADING_FAILURE;
}