Change "union value" to dynamically allocate long strings.

[pspp-builds.git] / src / language / dictionary / variable-display.c

diff --git a/src/language/dictionary/variable-display.c b/src/language/dictionary/variable-display.c
index cf3bad79449adf25cebccfb2830e61d075fc07c2..83df065b99728e58745ffc72b08742a562b62e55 100644 (file)
--- a/src/language/dictionary/variable-display.c
+++ b/src/language/dictionary/variable-display.c
@@ -24,10 +24,15 @@
 #include <language/command.h>
 #include <language/lexer/lexer.h>
 #include <language/lexer/variable-parser.h>
-#include <libpspp/alloc.h>
 #include <libpspp/message.h>
 #include <libpspp/str.h>
 
+#include "minmax.h"
+#include "xalloc.h"
+
+#include "gettext.h"
+#define _(msgid) gettext (msgid)
+
 /* Set variables' alignment
    This is the alignment for GUI display only.
    It affects nothing but GUIs
@@ -90,23 +95,36 @@ cmd_variable_width (struct lexer *lexer, struct dataset *ds)
   do
     {
       struct variable **v;
+      long int width;
       size_t nv;
       size_t i;
 
       if (!parse_variables (lexer, dataset_dict (ds), &v, &nv, PV_NONE))
         return CMD_FAILURE;
 
-      if ( lex_force_match (lexer, '(') )
-       {
-         if ( lex_force_int (lexer))
-           lex_get (lexer);
-         else
-           return CMD_FAILURE;
-         lex_force_match (lexer, ')');
-       }
+      if (!lex_force_match (lexer, '(') || !lex_force_int (lexer))
+        {
+          free (v);
+          return CMD_FAILURE;
+        }
+      width = lex_integer (lexer);
+      lex_get (lexer);
+      if (!lex_force_match (lexer, ')'))
+        {
+          free (v);
+          return CMD_FAILURE;
+        }
+
+      if (width < 0)
+        {
+          msg (SE, _("Variable display width must be a positive integer."));
+          free (v);
+          return CMD_FAILURE;
+        }
+      width = MIN (width, 2 * MAX_STRING);
 
       for( i = 0 ; i < nv ; ++i )
-        var_set_display_width (v[i], lex_integer (lexer));
+        var_set_display_width (v[i], width);
 
       while (lex_token (lexer) == '/')
        lex_get (lexer);