X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Flanguage%2Fdictionary%2Fvalue-labels.c;h=18e890ddb87f87a1b206facc4f771fcc69ae361b;hb=9ade26c8349b4434008c46cf09bc7473ec743972;hp=8c312ab8cee23ebec567ac3e1a8189285aa80e47;hpb=122ff2eeb1279acad0cac2ed3e667ba162a698b1;p=pspp-builds.git

diff --git a/src/language/dictionary/value-labels.c b/src/language/dictionary/value-labels.c
index 8c312ab8..18e890dd 100644
--- a/src/language/dictionary/value-labels.c
+++ b/src/language/dictionary/value-labels.c
@@ -1,5 +1,5 @@
 /* PSPP - a program for statistical analysis.
-   Copyright (C) 1997-9, 2000, 2009, 2010 Free Software Foundation, Inc.
+   Copyright (C) 1997-9, 2000, 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
@@ -19,17 +19,19 @@
 #include <stdio.h>
 #include <stdlib.h>
 
-#include <data/procedure.h>
-#include <data/value-labels.h>
-#include <data/variable.h>
-#include <language/command.h>
-#include <language/lexer/lexer.h>
-#include <language/lexer/value-parser.h>
-#include <language/lexer/variable-parser.h>
-#include <libpspp/message.h>
-#include <libpspp/str.h>
+#include "data/dictionary.h"
+#include "data/procedure.h"
+#include "data/value-labels.h"
+#include "data/variable.h"
+#include "language/command.h"
+#include "language/lexer/lexer.h"
+#include "language/lexer/value-parser.h"
+#include "language/lexer/variable-parser.h"
+#include "libpspp/i18n.h"
+#include "libpspp/message.h"
+#include "libpspp/str.h"
 
-#include "xalloc.h"
+#include "gl/xalloc.h"
 
 #include "gettext.h"
 #define _(msgid) gettext (msgid)
@@ -39,7 +41,8 @@
 static int do_value_labels (struct lexer *,
 			    const struct dictionary *dict, bool);
 static void erase_labels (struct variable **vars, size_t var_cnt);
-static int get_label (struct lexer *, struct variable **vars, size_t var_cnt);
+static int get_label (struct lexer *, struct variable **vars, size_t var_cnt,
+                      const char *dict_encoding);
 
 /* Stubs. */
 
@@ -78,7 +81,7 @@ do_value_labels (struct lexer *lexer, const struct dictionary *dict, bool erase)
       if (erase)
         erase_labels (vars, var_cnt);
       while (lex_token (lexer) != T_SLASH && lex_token (lexer) != T_ENDCMD)
-	if (!get_label (lexer, vars, var_cnt))
+	if (!get_label (lexer, vars, var_cnt, dict_get_encoding (dict)))
           goto lossage;
 
       if (lex_token (lexer) != T_SLASH)
@@ -92,10 +95,7 @@ do_value_labels (struct lexer *lexer, const struct dictionary *dict, bool erase)
       free (vars);
     }
 
-  if (parse_err)
-    return CMD_FAILURE;
-
-  return lex_end_of_command (lexer);
+  return parse_err ? CMD_FAILURE : CMD_SUCCESS;
 
  lossage:
   free (vars);
@@ -116,7 +116,8 @@ erase_labels (struct variable **vars, size_t var_cnt)
 /* Parse all the labels for the VAR_CNT variables in VARS and add
    the specified labels to those variables.  */
 static int
-get_label (struct lexer *lexer, struct variable **vars, size_t var_cnt)
+get_label (struct lexer *lexer, struct variable **vars, size_t var_cnt,
+           const char *dict_encoding)
 {
   /* Parse all the labels and add them to the variables. */
   do
@@ -125,6 +126,7 @@ get_label (struct lexer *lexer, struct variable **vars, size_t var_cnt)
       int width = var_get_width (vars[0]);
       union value value;
       struct string label;
+      size_t trunc_len;
       size_t i;
 
       /* Set value. */
@@ -145,10 +147,12 @@ get_label (struct lexer *lexer, struct variable **vars, size_t var_cnt)
 
       ds_init_substring (&label, lex_tokss (lexer));
 
-      if (ds_length (&label) > MAX_LABEL_LEN)
+      trunc_len = utf8_encoding_trunc_len (ds_cstr (&label), dict_encoding,
+                                           MAX_LABEL_LEN);
+      if (ds_length (&label) > trunc_len)
 	{
 	  msg (SW, _("Truncating value label to %d bytes."), MAX_LABEL_LEN);
-	  ds_truncate (&label, MAX_LABEL_LEN);
+	  ds_truncate (&label, trunc_len);
 	}
 
       for (i = 0; i < var_cnt; i++)