X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Flanguage%2Fdictionary%2Fvalue-labels.c;h=0fb847165255cfe06ce0c60d88fed6fc7c12b953;hb=e85b9209febb65cb4a59635507fba948325607cd;hp=9068290b7dda666495f24c1fe4499e7f7f28d9cf;hpb=81579d9e9f994fb2908f50af41c3eb033d216e58;p=pspp

diff --git a/src/language/dictionary/value-labels.c b/src/language/dictionary/value-labels.c
index 9068290b7d..0fb8471652 100644
--- a/src/language/dictionary/value-labels.c
+++ b/src/language/dictionary/value-labels.c
@@ -19,13 +19,15 @@
 #include <stdio.h>
 #include <stdlib.h>
 
-#include "data/procedure.h"
+#include "data/dataset.h"
+#include "data/dictionary.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"
 
@@ -38,8 +40,9 @@
 
 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 void erase_labels (struct variable **vars, size_t n_vars);
+static int get_label (struct lexer *, struct variable **vars, size_t n_vars,
+                      const char *dict_encoding);
 
 /* Stubs. */
 
@@ -61,24 +64,24 @@ static int
 do_value_labels (struct lexer *lexer, const struct dictionary *dict, bool erase)
 {
   struct variable **vars; /* Variable list. */
-  size_t var_cnt;         /* Number of variables. */
+  size_t n_vars;         /* Number of variables. */
   int parse_err=0;        /* true if error parsing variables */
 
   lex_match (lexer, T_SLASH);
 
   while (lex_token (lexer) != T_ENDCMD)
     {
-      parse_err = !parse_variables (lexer, dict, &vars, &var_cnt,
+      parse_err = !parse_variables (lexer, dict, &vars, &n_vars,
 				    PV_SAME_WIDTH);
-      if (var_cnt < 1)
+      if (n_vars < 1)
 	{
 	  free(vars);
 	  return CMD_FAILURE;
 	}
       if (erase)
-        erase_labels (vars, var_cnt);
+        erase_labels (vars, n_vars);
       while (lex_token (lexer) != T_SLASH && lex_token (lexer) != T_ENDCMD)
-	if (!get_label (lexer, vars, var_cnt))
+	if (!get_label (lexer, vars, n_vars, dict_get_encoding (dict)))
           goto lossage;
 
       if (lex_token (lexer) != T_SLASH)
@@ -92,31 +95,27 @@ 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);
   return CMD_FAILURE;
 }
 
-/* Erases all the labels for the VAR_CNT variables in VARS. */
+/* Erases all the labels for the N_VARS variables in VARS. */
 static void
-erase_labels (struct variable **vars, size_t var_cnt)
+erase_labels (struct variable **vars, size_t n_vars)
 {
-  size_t i;
-
   /* Erase old value labels if desired. */
-  for (i = 0; i < var_cnt; i++)
+  for (size_t i = 0; i < n_vars; i++)
     var_clear_value_labels (vars[i]);
 }
 
-/* Parse all the labels for the VAR_CNT variables in VARS and add
+/* Parse all the labels for the N_VARS 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 n_vars,
+           const char *dict_encoding)
 {
   /* Parse all the labels and add them to the variables. */
   do
@@ -125,11 +124,12 @@ 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. */
       value_init (&value, width);
-      if (!parse_value (lexer, &value, width))
+      if (!parse_value (lexer, &value, vars[0]))
         {
           value_destroy (&value, width);
           return 0;
@@ -145,13 +145,15 @@ 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++)
+      for (i = 0; i < n_vars; i++)
         var_replace_value_label (vars[i], &value, ds_cstr (&label));
 
       ds_destroy (&label);