update from main archive 961030

diff --git a/locale/programs/charmap.c b/locale/programs/charmap.c
index f938d79..8d7b4cf 100644 (file)
--- a/locale/programs/charmap.c
+++ b/locale/programs/charmap.c
@@ -238,9 +238,9 @@ parse_charmap (const char *filename)
                  continue;
                }
              if ((nowtok == tok_mb_cur_max && result->mb_cur_min != 0
-                  && arg->val.num < result->mb_cur_min)
+                  && (int) arg->val.num < result->mb_cur_min)
                  || (nowtok == tok_mb_cur_min && result->mb_cur_max != 0
-                     && arg->val.num > result->mb_cur_max))
+                     && (int) arg->val.num > result->mb_cur_max))
                {
                  lr_error (cmfile, _("\
 value of <mb_cur_max> must be greater than the value of <mb_cur_min>"));
@@ -612,7 +612,7 @@ new_width (struct linereader *cmfile, struct charset_t *result,
   unsigned int from_val, to_val;
 
   from_val = charset_find_value (result, from, strlen (from));
-  if (from_val == ILLEGAL_CHAR_VALUE)
+  if ((wchar_t) from_val == ILLEGAL_CHAR_VALUE)
     {
       lr_error (cmfile, _("unknown character `%s'"), from);
       return;
@@ -623,7 +623,7 @@ new_width (struct linereader *cmfile, struct charset_t *result,
   else
     {
       to_val = charset_find_value (result, to, strlen (to));
-      if (to_val == ILLEGAL_CHAR_VALUE)
+      if ((wchar_t) to_val == ILLEGAL_CHAR_VALUE)
        {
          lr_error (cmfile, _("unknown character `%s'"), to);
          return;

diff --git a/locale/programs/charset.h b/locale/programs/charset.h
index 2885bf1..620e4d5 100644 (file)
--- a/locale/programs/charset.h
+++ b/locale/programs/charset.h
@@ -43,7 +43,7 @@ struct charset_t
   struct width_rule *width_rules;
   size_t nwidth_rules;
   size_t nwidth_rules_max;
-  int width_default;
+  unsigned int width_default;
 
   struct obstack mem_pool;
   hash_table char_table;

diff --git a/locale/programs/ld-collate.c b/locale/programs/ld-collate.c
index 1bfa533..f836ecd 100644 (file)
--- a/locale/programs/ld-collate.c
+++ b/locale/programs/ld-collate.c
@@ -98,8 +98,8 @@ struct locale_collate_t
   hash_table result;
 
   /* Sorting rules given in order_start line.  */
-  int nrules;
-  int nrules_max;
+  u_int32_t nrules;
+  u_int32_t nrules_max;
   enum coll_sort_rule *rules;
 
   /* Used while recognizing symbol composed of multiple tokens
@@ -122,10 +122,10 @@ struct locale_collate_t
   /* While collecting the weigths we need some temporary space.  */
   unsigned int current_order;
   int *weight_cnt;
-  int weight_idx;
+  unsigned int weight_idx;
   unsigned int *weight;
-  int nweight;
-  int nweight_max;
+  size_t nweight;
+  size_t nweight_max;
 
   /* Patch lists.  */
   patch_t *current_patch;
@@ -241,7 +241,7 @@ collate_finish (struct localedef_t *locale, struct charset_t *charset)
 
       if (value == 0)
        error_at_line (0, 0, patch->fname, patch->lineno,
-                       _("no weight defined for symbol `%s'"), patch->token);
+                      _("no weight defined for symbol `%s'"), patch->token);
       else
        *patch->where.pos = value;
     }
@@ -482,7 +482,8 @@ Computing table size for collation information might take a while..."),
            ADD_VALUE (collate->undefined.ordering[cnt]);                     \
            for (disp = 0; disp < collate->undefined.ordering[cnt]; ++disp)   \
              {                                                               \
-               if (collate->undefined.ordering[idx] == ELLIPSIS_CHAR)        \
+               if ((wchar_t) collate->undefined.ordering[idx]                \
+                   == ELLIPSIS_CHAR)                                         \
                  ADD_VALUE ((pelem)->name[0]);                               \
                else                                                          \
                  ADD_VALUE (collate->undefined.ordering[idx++]);             \
@@ -540,7 +541,7 @@ Computing table size for collation information might take a while..."),
            size_t inner;
 
            for (inner = 0; inner < collate->nrules; ++inner)
-             if (collate->undefined.ordering[collate->nrules + inner]
+             if ((wchar_t)collate->undefined.ordering[collate->nrules + inner]
                  == ELLIPSIS_CHAR)
                table[cnt * entry_size + 1 + inner] = cnt;
              else
@@ -1049,11 +1050,11 @@ collate_element_to (struct linereader *lr, struct localedef_t *locale,
     }
 
   value = charset_find_value (charset, code->val.str.start, code->val.str.len);
-  if (value != ILLEGAL_CHAR_VALUE)
+  if ((wchar_t) value != ILLEGAL_CHAR_VALUE)
     {
       lr_error (lr, _("symbol for multicharacter collating element "
                      "`%.*s' duplicates symbolic name in charset"),
-               code->val.str.len, code->val.str.start);
+               (int) code->val.str.len, code->val.str.start);
       return;
     }
 
@@ -1062,7 +1063,7 @@ collate_element_to (struct linereader *lr, struct localedef_t *locale,
     {
       lr_error (lr, _("symbol for multicharacter collating element "
                      "`%.*s' duplicates other element definition"),
-               code->val.str.len, code->val.str.start);
+               (int) code->val.str.len, code->val.str.start);
       return;
     }
 
@@ -1071,7 +1072,7 @@ collate_element_to (struct linereader *lr, struct localedef_t *locale,
     {
       lr_error (lr, _("symbol for multicharacter collating element "
                      "`%.*s' duplicates symbol definition"),
-               code->val.str.len, code->val.str.start);
+               (int) code->val.str.len, code->val.str.start);
       return;
     }
 
@@ -1180,7 +1181,7 @@ collate_symbol (struct linereader *lr, struct localedef_t *locale,
     {
       lr_error (lr, _("symbol for multicharacter collating element "
                      "`%.*s' duplicates symbolic name in charset"),
-               code->val.str.len, code->val.str.start);
+               (int) code->val.str.len, code->val.str.start);
       return;
     }
 
@@ -1189,7 +1190,7 @@ collate_symbol (struct linereader *lr, struct localedef_t *locale,
     {
       lr_error (lr, _("symbol for multicharacter collating element "
                      "`%.*s' duplicates element definition"),
-               code->val.str.len, code->val.str.start);
+               (int) code->val.str.len, code->val.str.start);
       return;
     }
 
@@ -1198,7 +1199,7 @@ collate_symbol (struct linereader *lr, struct localedef_t *locale,
     {
       lr_error (lr, _("symbol for multicharacter collating element "
                      "`%.*s' duplicates other symbol definition"),
-               code->val.str.len, code->val.str.start);
+               (int) code->val.str.len, code->val.str.start);
       return;
     }
 
@@ -1256,7 +1257,7 @@ collate_order_elem (struct linereader *lr, struct localedef_t *locale,
   int result = 0;
   wchar_t value;
   void *tmp;
-  int i;
+  unsigned int i;
 
   switch (code->tok)
     {
@@ -1284,7 +1285,7 @@ collate_order_elem (struct linereader *lr, struct localedef_t *locale,
              if (lastp->name[0] == value && lastp->name[1] == L'\0')
                {
                  lr_error (lr, _("duplicate definition for character `%.*s'"),
-                           code->val.str.len, code->val.str.start);
+                           (int) code->val.str.len, code->val.str.start);
                  lr_ignore_rest (lr, 0);
                  result = -1;
                  break;
@@ -1311,7 +1312,7 @@ collate_order_elem (struct linereader *lr, struct localedef_t *locale,
                                (void *) collate->current_element) < 0)
                {
                  lr_error (lr, _("cannot insert collation element `%.*s'"),
-                           code->val.str.len, code->val.str.start);
+                           (int) code->val.str.len, code->val.str.start);
                  exit (4);
                }
            }
@@ -1344,8 +1345,8 @@ collation element `%.*s' appears more than once: ignore line"),
          if ((unsigned long int) tmp != 0ul)
            {
              lr_error (lr, _("\
-collation symbol `.*s' appears more than once: ignore line"),
-                       code->val.str.len, code->val.str.start);
+collation symbol `%.*s' appears more than once: ignore line"),
+                       (int) code->val.str.len, code->val.str.start);
              lr_ignore_rest (lr, 0);
              result = -1;
              break;
@@ -1364,7 +1365,7 @@ collation symbol `.*s' appears more than once: ignore line"),
        {
          if (verbose)
            lr_error (lr, _("unknown symbol `%.*s': line ignored"),
-                     code->val.str.len, code->val.str.start);
+                     (int) code->val.str.len, code->val.str.start);
           lr_ignore_rest (lr, 0);
 
           result = -1;
@@ -1454,7 +1455,7 @@ line after ellipsis must contain character definition"));
            data[collate->nrules + cnt] = collate->weight[cnt];
 
          for (cnt = 0; cnt < collate->nrules; ++cnt)
-           if (data[ptr[cnt]] != ELLIPSIS_CHAR)
+           if ((wchar_t) data[ptr[cnt]] != ELLIPSIS_CHAR)
              ptr[cnt] = 0;
 
          while (name[0] <= value)
@@ -1555,7 +1556,7 @@ collate_weight_bsymbol (struct linereader *lr, struct localedef_t *locale,
     {
       if (verbose)
        lr_error (lr, _("unknown symbol `%.*s': line ignored"),
-                 code->val.str.len, code->val.str.start);
+                 (int) code->val.str.len, code->val.str.start);
       lr_ignore_rest (lr, 0);
       return -1;
     }
@@ -1729,7 +1730,7 @@ collate_simple_weight (struct linereader *lr, struct localedef_t *locale,
                  {
                    if (verbose)
                      lr_error (lr, _("unknown symbol `%.*s': line ignored"),
-                               putp - startp, startp);
+                               (int) (putp - startp), startp);
                    lr_ignore_rest (lr, 0);
                    return -1;
                  }
@@ -1741,8 +1742,8 @@ collate_simple_weight (struct linereader *lr, struct localedef_t *locale,
 
                if (*runp == lr->escape_char)
                  {
-                   static char digits[] = "0123456789abcdef";
-                   char *dp;
+                   static const char digits[] = "0123456789abcdef";
+                   const char *dp;
                    int base;
 
                    ++runp;

diff --git a/locale/programs/ld-ctype.c b/locale/programs/ld-ctype.c
index 64f73d4..bc3e391 100644 (file)
--- a/locale/programs/ld-ctype.c
+++ b/locale/programs/ld-ctype.c
@@ -75,7 +75,7 @@ struct locale_ctype_t
 
   /* We will allow up to 8 * sizeof(u_int32_t) - 1 character classes.  */
 #define MAX_NR_CHARCLASS (8 * sizeof (u_int32_t) - 1)
-  int nr_charclass;
+  size_t nr_charclass;
   const char *classnames[MAX_NR_CHARCLASS];
   unsigned long int current_class_mask;
   unsigned int last_class_char;
@@ -306,7 +306,7 @@ character %s'%s' in class `%s' must not be in class `%s'"),
 
   /* ... and now test <SP> as a special case.  */
   space_value = charset_find_value (charset, "SP", 2);
-  if (space_value == ILLEGAL_CHAR_VALUE)
+  if ((wchar_t) space_value == ILLEGAL_CHAR_VALUE)
     error (0, 0, _("character <SP> not defined in character map"));
   else if ((cnt = BITPOS (tok_space),
             (ELEM (ctype, class_collection, , space_value)
@@ -537,7 +537,7 @@ int
 ctype_is_charclass (struct linereader *lr, struct localedef_t *locale,
                    const char *name)
 {
-  int cnt;
+  size_t cnt;
 
   for (cnt = 0; cnt < locale->categories[LC_CTYPE].ctype->nr_charclass; ++cnt)
     if (strcmp (name, locale->categories[LC_CTYPE].ctype->classnames[cnt])
@@ -554,7 +554,7 @@ ctype_class_start (struct linereader *lr, struct localedef_t *locale,
                   struct charset_t *charset)
 {
   struct locale_ctype_t *ctype = locale->categories[LC_CTYPE].ctype;
-  int cnt;
+  size_t cnt;
 
   switch (tok)
     {
@@ -625,7 +625,7 @@ ctype_class_from (struct linereader *lr, struct localedef_t *locale,
 
   ctype->last_class_char = value;
 
-  if (value == ILLEGAL_CHAR_VALUE)
+  if ((wchar_t) value == ILLEGAL_CHAR_VALUE)
     /* In the LC_CTYPE category it is no error when a character is
        not found.  This has to be ignored silently.  */
     return;
@@ -737,7 +737,7 @@ ctype_map_from (struct linereader *lr, struct localedef_t *locale,
 
   value = charset_find_value (charset, code->val.str.start, code->val.str.len);
 
-  if (value == ILLEGAL_CHAR_VALUE)
+  if ((wchar_t) value == ILLEGAL_CHAR_VALUE)
     /* In the LC_CTYPE category it is no error when a character is
        not found.  This has to be ignored silently.  */
     return;
@@ -757,8 +757,8 @@ ctype_map_to (struct linereader *lr, struct localedef_t *locale,
 
   value = charset_find_value (charset, code->val.str.start, code->val.str.len);
 
-  if (ctype->from_map_char == ILLEGAL_CHAR_VALUE
-      || value == ILLEGAL_CHAR_VALUE)
+  if ((wchar_t) ctype->from_map_char == ILLEGAL_CHAR_VALUE
+      || (wchar_t) value == ILLEGAL_CHAR_VALUE)
     {
       /* In the LC_CTYPE category it is no error when a character is
         not found.  This has to be ignored silently.  */
@@ -790,7 +790,7 @@ static void
 ctype_class_newP (struct linereader *lr, struct locale_ctype_t *ctype,
                  const char *name)
 {
-  int cnt;
+  size_t cnt;
 
   for (cnt = 0; cnt < ctype->nr_charclass; ++cnt)
     if (strcmp (ctype->classnames[cnt], name) == 0)
@@ -798,7 +798,7 @@ ctype_class_newP (struct linereader *lr, struct locale_ctype_t *ctype,
 
   if (cnt < ctype->nr_charclass)
     {
-      lr_error (lr, _("character class `%s' already defined"));
+      lr_error (lr, _("character class `%s' already defined"), name);
       return;
     }
 
@@ -817,7 +817,7 @@ ctype_map_newP (struct linereader *lr, struct locale_ctype_t *ctype,
                const char *name, struct charset_t *charset)
 {
   size_t max_chars = 0;
-  int cnt;
+  size_t cnt;
 
   for (cnt = 0; cnt < ctype->map_collection_nr; ++cnt)
     {
@@ -830,7 +830,7 @@ ctype_map_newP (struct linereader *lr, struct locale_ctype_t *ctype,
 
   if (cnt < ctype->map_collection_nr)
     {
-      lr_error (lr, _("character map `%s' already defined"));
+      lr_error (lr, _("character map `%s' already defined"), name);
       return;
     }
 
@@ -934,7 +934,7 @@ set_class_defaults (struct locale_ctype_t *ctype, struct charset_t *charset)
          tmp[0] = ch;
 
          value = charset_find_value (charset, tmp, 1);
-         if (value == ILLEGAL_CHAR_VALUE)
+         if ((wchar_t) value == ILLEGAL_CHAR_VALUE)
            {
              error (0, 0, _("\
 character `%s' not defined while needed as default value"),
@@ -998,7 +998,7 @@ character `%s' not defined while needed as default value"),
       unsigned int value;
 
       value = charset_find_value (charset, "space", 5);
-      if (value == ILLEGAL_CHAR_VALUE)
+      if ((wchar_t) value == ILLEGAL_CHAR_VALUE)
        error (0, 0, _("\
 character `%s' not defined while needed as default value"),
               "<space>");
@@ -1006,7 +1006,7 @@ character `%s' not defined while needed as default value"),
        ELEM (ctype, class_collection, , value) |= BIT (tok_space);
 
       value = charset_find_value (charset, "form-feed", 9);
-      if (value == ILLEGAL_CHAR_VALUE)
+      if ((wchar_t) value == ILLEGAL_CHAR_VALUE)
        error (0, 0, _("\
 character `%s' not defined while needed as default value"),
               "<form-feed>");
@@ -1014,7 +1014,7 @@ character `%s' not defined while needed as default value"),
        ELEM (ctype, class_collection, , value) |= BIT (tok_space);
 
       value = charset_find_value (charset, "newline", 7);
-      if (value == ILLEGAL_CHAR_VALUE)
+      if ((wchar_t) value == ILLEGAL_CHAR_VALUE)
        error (0, 0, _("\
 character `%s' not defined while needed as default value"),
               "<newline>");
@@ -1022,7 +1022,7 @@ character `%s' not defined while needed as default value"),
        ELEM (ctype, class_collection, , value) |= BIT (tok_space);
 
       value = charset_find_value (charset, "carriage-return", 15);
-      if (value == ILLEGAL_CHAR_VALUE)
+      if ((wchar_t) value == ILLEGAL_CHAR_VALUE)
        error (0, 0, _("\
 character `%s' not defined while needed as default value"),
               "<carriage-return>");
@@ -1030,7 +1030,7 @@ character `%s' not defined while needed as default value"),
        ELEM (ctype, class_collection, , value) |= BIT (tok_space);
 
       value = charset_find_value (charset, "tab", 3);
-      if (value == ILLEGAL_CHAR_VALUE)
+      if ((wchar_t) value == ILLEGAL_CHAR_VALUE)
        error (0, 0, _("\
 character `%s' not defined while needed as default value"),
               "<tab>");
@@ -1038,7 +1038,7 @@ character `%s' not defined while needed as default value"),
        ELEM (ctype, class_collection, , value) |= BIT (tok_space);
 
       value = charset_find_value (charset, "vertical-tab", 12);
-      if (value == ILLEGAL_CHAR_VALUE)
+      if ((wchar_t) value == ILLEGAL_CHAR_VALUE)
        error (0, 0, _("\
 character `%s' not defined while needed as default value"),
               "<vertical-tab>");
@@ -1064,7 +1064,7 @@ character `%s' not defined while needed as default value"),
       unsigned int value;
 
       value = charset_find_value (charset, "space", 5);
-      if (value == ILLEGAL_CHAR_VALUE)
+      if ((wchar_t) value == ILLEGAL_CHAR_VALUE)
        error (0, 0, _("\
 character `%s' not defined while needed as default value"),
               "<space>");
@@ -1072,7 +1072,7 @@ character `%s' not defined while needed as default value"),
        ELEM (ctype, class_collection, , value) |= BIT (tok_blank);
 
       value = charset_find_value (charset, "tab", 3);
-      if (value == ILLEGAL_CHAR_VALUE)
+      if ((wchar_t) value == ILLEGAL_CHAR_VALUE)
        error (0, 0, _("\
 character `%s' not defined while needed as default value"),
               "<tab>");
@@ -1103,7 +1103,7 @@ character `%s' not defined while needed as default value"),
       unsigned long int mask = BIT (tok_upper) | BIT (tok_lower) |
        BIT (tok_alpha) | BIT (tok_digit) | BIT (tok_xdigit) | BIT (tok_punct);
       size_t cnt;
-      int space;
+      wchar_t space;
 
       for (cnt = 0; cnt < ctype->class_collection_act; ++cnt)
        if ((ctype->class_collection[cnt] & mask) != 0)
@@ -1136,10 +1136,10 @@ character `%s' not defined while needed as default value"),
          tmp[1] = (char) ch;
 
          value_from = charset_find_value (charset, &tmp[1], 1);
-         if (value_from == ILLEGAL_CHAR_VALUE)
+         if ((wchar_t) value_from == ILLEGAL_CHAR_VALUE)
            {
              error (0, 0, _("\
-character `%c' not defined while needed as default value"),
+character `%s' not defined while needed as default value"),
                     tmp);
              continue;
            }
@@ -1147,7 +1147,7 @@ character `%c' not defined while needed as default value"),
          /* This conversion is implementation defined.  */
          tmp[1] = (char) (ch + ('A' - 'a'));
          value_to = charset_find_value (charset, &tmp[1], 1);
-         if (value_to == -1)
+         if ((wchar_t) value_to == ILLEGAL_CHAR_VALUE)
            {
              error (0, 0, _("\
 character `%s' not defined while needed as default value"),

diff --git a/locale/programs/ld-time.c b/locale/programs/ld-time.c
index 6fcb069..6be7309 100644 (file)
--- a/locale/programs/ld-time.c
+++ b/locale/programs/ld-time.c
@@ -672,7 +672,7 @@ time_add (struct linereader *lr, struct localedef_t *locale,
     case tok_##cat:                                                          \
       if (time->cur_num_##cat >= max)                                        \
        lr_error (lr, _("\
-too many values for field `%s' in category `LC_TIME'"),                              \
+too many values for field `%s' in category `%s'"),                           \
                  #cat, "LC_TIME");                                           \
       else if (code->val.str.start == NULL)                                  \
        {                                                                     \

diff --git a/locale/programs/linereader.c b/locale/programs/linereader.c
index 14496c0..4759615 100644 (file)
--- a/locale/programs/linereader.c
+++ b/locale/programs/linereader.c
@@ -279,7 +279,7 @@ get_toplvl_escape (struct linereader *lr)
        }
 
       if ((base == 16 && !isxdigit (ch))
-         || (base != 16 && (ch < '0' || ch >= '0' + base)))
+         || (base != 16 && (ch < '0' || ch >= (int) ('0' + base))))
        {
        esc_error:
          lr->token.val.str.start = &lr->buf[start_idx];
@@ -299,7 +299,7 @@ get_toplvl_escape (struct linereader *lr)
 
       ch = lr_getc (lr);
       if ((base == 16 && !isxdigit (ch))
-         || (base != 16 && (ch < '0' || ch >= '0' + base)))
+         || (base != 16 && (ch < '0' || ch >= (int) ('0' + base))))
        goto esc_error;
 
       byte *= base;
@@ -521,7 +521,7 @@ get_string (struct linereader *lr, const struct charset_t *charset)
          {
            value = charset_find_value (charset, &buf[startidx],
                                        bufact - startidx);
-           if (value == ILLEGAL_CHAR_VALUE)
+           if ((wchar_t) value == ILLEGAL_CHAR_VALUE)
              illegal_string = 1;
            bufact = startidx;
 

diff --git a/locale/programs/linereader.h b/locale/programs/linereader.h
index b78697e..bf5f1bc 100644 (file)
--- a/locale/programs/linereader.h
+++ b/locale/programs/linereader.h
@@ -117,7 +117,7 @@ lr_ungetc (struct linereader *lr, int ch)
 
 
 static inline int
-lr_ungetn (struct linereader *lr, int n)
+lr_ungetn (struct linereader *lr, size_t n)
 {
   if (lr->idx < n)
     return -1;

diff --git a/locale/programs/localedef.c b/locale/programs/localedef.c
index fbcd04a..1db26e5 100644 (file)
--- a/locale/programs/localedef.c
+++ b/locale/programs/localedef.c
@@ -463,10 +463,10 @@ construct_output_path (char *path)
         the end of the function we need another byte for the trailing
         '/'.  */
       if (normal == NULL)
-       asprintf (&result, "%s/%s\0", LOCALE_PATH, path);
+       asprintf (&result, "%s/%s%c", LOCALE_PATH, path, '\0');
       else
-       asprintf (&result, "%s/%.*s%s%s\0", LOCALE_PATH, startp - path, path,
-                 normal, endp);
+       asprintf (&result, "%s/%.*s%s%s%c", LOCALE_PATH, startp - path, path,
+                 normal, endp, '\0');
     }
   else
     {

diff --git a/locale/programs/stringtrans.c b/locale/programs/stringtrans.c
index 6958dd2..4351eea 100644 (file)
--- a/locale/programs/stringtrans.c
+++ b/locale/programs/stringtrans.c
@@ -93,7 +93,7 @@ translate_string (char *str, struct charset_t *charset)
        }
 
       value = charset_find_value (charset, str + 1, tp - (str + 1));
-      if (value == ILLEGAL_CHAR_VALUE)
+      if ((wchar_t) value == ILLEGAL_CHAR_VALUE)
        {
          free (buf);
          return NULL;

diff --git a/login/Makefile b/login/Makefile
index 56a6aeb..247ab95 100644 (file)
--- a/login/Makefile
+++ b/login/Makefile
@@ -30,6 +30,8 @@ routines := setutent endutent getutent getutid getutline pututline    \
 
 # Build the -lutil library with these extra functions.
 extra-libs      := libutil
+extra-libs-others := $(extra-libs)
+
 libutil-routines:= login login_tty logout logwtmp pty