From 0f1b17abb6bd3e98e0f0747950144fe2ea67ea2f Mon Sep 17 00:00:00 2001 From: Ben Pfaff Date: Sat, 1 Jan 2011 11:11:07 -0800 Subject: [PATCH] VECTOR: Eliminate VAR_NAME_LEN limit for variable names. Most uses of VAR_NAME_LEN within PSPP are wrong due to encoding issues: the limit applies to variable names in the encoding used by the data set, but most uses of VAR_NAME_LEN actually limit the length of a name in UTF-8. The UTF-8 representation of a name can be longer or shorter than its representation in the data set encoding, so it seems best to eliminate references to VAR_NAME_LEN entirely. --- src/language/dictionary/vector.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/src/language/dictionary/vector.c b/src/language/dictionary/vector.c index 3be0723f..8eb7ef16 100644 --- a/src/language/dictionary/vector.c +++ b/src/language/dictionary/vector.c @@ -1,5 +1,5 @@ /* PSPP - a program for statistical analysis. - Copyright (C) 1997-9, 2000, 2010 Free Software Foundation, Inc. + Copyright (C) 1997-9, 2000, 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 @@ -159,18 +159,20 @@ cmd_vector (struct lexer *lexer, struct dataset *ds) int j; for (j = 0; j < var_cnt; j++) { - char name[VAR_NAME_LEN + INT_STRLEN_BOUND (int) + 1]; - sprintf (name, "%s%d", vectors[i], j + 1); + char *name = xasprintf ("%s%d", vectors[i], j + 1); if (strlen (name) > VAR_NAME_LEN) { + free (name); msg (SE, _("%s is too long for a variable name."), name); goto fail; } if (dict_lookup_var (dict, name)) { + free (name); msg (SE, _("%s is an existing variable name."), name); goto fail; } + free (name); } } @@ -181,10 +183,10 @@ cmd_vector (struct lexer *lexer, struct dataset *ds) int j; for (j = 0; j < var_cnt; j++) { - char name[VAR_NAME_LEN + 1]; - sprintf (name, "%s%d", vectors[i], j + 1); + char *name = xasprintf ("%s%d", vectors[i], j + 1); vars[j] = dict_create_var_assert (dict, name, 0); var_set_both_formats (vars[j], &format); + free (name); } dict_create_vector_assert (dict, vectors[i], vars, var_cnt); } -- 2.30.2