nls/FreeBSD/msgcat.c.patch

   1 --- msgcat.c.orig       2007-02-07 01:54:34.000000000 -0800
   2 +++ msgcat.c    2007-02-07 02:03:33.000000000 -0800
   3 @@ -45,16 +45,22 @@
   4  #include <errno.h>
   5  #include <fcntl.h>
   6  #include <limits.h>
   7 -#include <locale.h>
   8 +#include <xlocale.h>
   9  #include <nl_types.h>
  10  #include <stdio.h>
  11  #include <stdlib.h>
  12  #include <string.h>
  13  #include <unistd.h>
  14 +#include <machine/endian.h>
  15 +#include <libkern/OSByteOrder.h>
  16  #include "un-namespace.h"
  17
  18  #include "msgcat.h"
  19 -#include "../locale/setlocale.h"        /* for ENCODING_LEN */
  20 +#include "setlocale.h"        /* for ENCODING_LEN */
  21 +
  22 +#ifndef ntohll
  23 +#define ntohll(x) OSSwapBigToHostInt64(x)
  24 +#endif
  25
  26  #define _DEFAULT_NLS_PATH "/usr/share/nls/%L/%N.cat:/usr/share/nls/%N/%L:/usr/local/share/nls/%L/%N.cat:/usr/local/share/nls/%N/%L"
  27
  28 @@ -87,7 +93,7 @@
  29                 return (loadCat(name));
  30
  31         if (type == NL_CAT_LOCALE)
  32 -               lang = setlocale(LC_MESSAGES, NULL);
  33 +               lang = (char *)querylocale(LC_MESSAGES_MASK, NULL);
  34         else
  35                 lang = getenv("LANG");
  36
  37 @@ -210,21 +216,21 @@
  38
  39  #define LOOKUP(PARENT, CHILD, ID, NUM, SET) {                    \
  40         lo = 0;                                                  \
  41 -       if (ID - 1 < PARENT->NUM) {                              \
  42 +       if (ID - 1 < NUM) {                              \
  43                 cur = ID - 1;                                    \
  44                 hi = ID;                                         \
  45         } else {                                                 \
  46 -               hi = PARENT->NUM;                                \
  47 +               hi = NUM;                                \
  48                 cur = (hi - lo) / 2;                             \
  49         }                                                        \
  50         while (TRUE) {                                           \
  51                 CHILD = PARENT->SET + cur;                       \
  52 -               if (CHILD->ID == ID)                             \
  53 +               if (ntohl(CHILD->ID) == ID)                             \
  54                         break;                                   \
  55 -               if (CHILD->ID < ID) {                            \
  56 +               if (ntohl(CHILD->ID) < ID) {                            \
  57                         lo = cur + 1;                            \
  58 -                       if (hi > cur + (ID - CHILD->ID) + 1)     \
  59 -                               hi = cur + (ID - CHILD->ID) + 1; \
  60 +                       if (hi > cur + (ID - ntohl(CHILD->ID)) + 1)     \
  61 +                               hi = cur + (ID - ntohl(CHILD->ID)) + 1; \
  62                         dir = 1;                                 \
  63                 } else {                                         \
  64                         hi = cur;                                \
  65 @@ -240,32 +246,28 @@
  66  }
  67
  68  static MCSetT *
  69 -MCGetSet(cat, setId)
  70 -       MCCatT  *cat;
  71 -       int     setId;
  72 +MCGetSet(MCCatT *cat, int setId)
  73  {
  74         MCSetT  *set;
  75 -       long    lo, hi, cur, dir;
  76 +       int32_t    lo, hi, cur, dir;
  77
  78         if (cat == NULL || setId <= 0)
  79                 return (NULL);
  80 -       LOOKUP(cat, set, setId, numSets, sets);
  81 +       LOOKUP(cat, set, setId, cat->numSets, sets);
  82         if (set->invalid && loadSet(cat, set) <= 0)
  83                 return (NULL);
  84         return (set);
  85  }
  86
  87  static MCMsgT *
  88 -MCGetMsg(set, msgId)
  89 -       MCSetT  *set;
  90 -       int     msgId;
  91 +MCGetMsg(MCSetT *set, int msgId)
  92  {
  93         MCMsgT  *msg;
  94 -       long    lo, hi, cur, dir;
  95 +       int32_t    lo, hi, cur, dir;
  96
  97         if (set == NULL || set->invalid || msgId <= 0)
  98                 return (NULL);
  99 -       LOOKUP(set, msg, msgId, numMsgs, u.msgs);
 100 +       LOOKUP(set, msg, msgId, ntohl(set->numMsgs), u.msgs);
 101         return (msg);
 102  }
 103
 104 @@ -357,7 +359,7 @@
 105         MCHeaderT       header;
 106         MCCatT          *cat;
 107         MCSetT          *set;
 108 -       long            i;
 109 +       int32_t         i;
 110         off_t           nextSet;
 111         int             saverr;
 112
 113 @@ -377,27 +379,30 @@
 114             strncmp(header.magic, MCMagic, MCMagicLen) != 0)
 115                 CORRUPT();
 116
 117 -       if (header.majorVer != MCMajorVer) {
 118 +       if (ntohl(header.majorVer) != MCMajorVer) {
 119                 (void)fclose(cat->fp);
 120                 free(cat);
 121 -               (void)fprintf(stderr, "%s: %s is version %ld, we need %ld.\n",
 122 -                   _errowner, catpath, header.majorVer, MCMajorVer);
 123 +               if (OSSwapInt32(ntohl(header.majorVer)) == MCMajorVer) {
 124 +                   (void)fprintf(stderr, "%s: %s is the wrong byte ordering.\n", _errowner, catpath);
 125 +               } else {
 126 +                   (void)fprintf(stderr, "%s: %s is version %d, we need %d.\n", _errowner, catpath, (int)ntohl(header.majorVer), MCMajorVer);
 127 +               }
 128                 NLRETERR(EFTYPE);
 129         }
 130 -       if (header.numSets <= 0) {
 131 +       if (ntohl(header.numSets) <= 0) {
 132                 (void)fclose(cat->fp);
 133                 free(cat);
 134 -               (void)fprintf(stderr, "%s: %s has %ld sets!\n",
 135 -                   _errowner, catpath, header.numSets);
 136 +               (void)fprintf(stderr, "%s: %s has %d sets!\n",
 137 +                   _errowner, catpath, (int)ntohl(header.numSets));
 138                 NLRETERR(EFTYPE);
 139         }
 140
 141 -       cat->numSets = header.numSets;
 142 -       if ((cat->sets = (MCSetT *)malloc(sizeof(MCSetT) * header.numSets)) ==
 143 +       cat->numSets = ntohl(header.numSets);
 144 +       if ((cat->sets = (MCSetT *)malloc(sizeof(MCSetT) * cat->numSets)) ==
 145             NULL)
 146                 NOSPACE();
 147
 148 -       nextSet = header.firstSet;
 149 +       nextSet = ntohll(header.firstSet);
 150         for (i = 0; i < cat->numSets; ++i) {
 151                 if (fseeko(cat->fp, nextSet, SEEK_SET) == -1) {
 152                         __nls_free_resources(cat, i);
 153 @@ -414,7 +419,7 @@
 154                 /* if it's invalid, skip over it (and backup 'i') */
 155                 if (set->invalid) {
 156                         --i;
 157 -                       nextSet = set->nextSet;
 158 +                       nextSet = ntohll(set->nextSet);
 159                         continue;
 160                 }
 161  #if 0
 162 @@ -432,7 +437,7 @@
 163                 } else
 164  #endif
 165                         set->invalid = TRUE;
 166 -               nextSet = set->nextSet;
 167 +               nextSet = ntohll(set->nextSet);
 168         }
 169  #if 0
 170         if (cat->loadType == MCLoadAll) {
 171 @@ -453,11 +458,11 @@
 172         int     saverr;
 173
 174         /* Get the data */
 175 -       if (fseeko(cat->fp, set->data.off, SEEK_SET) == -1)
 176 +       if (fseeko(cat->fp, ntohll(set->data.off), SEEK_SET) == -1)
 177                 return (0);
 178 -       if ((set->data.str = malloc(set->dataLen)) == NULL)
 179 +       if ((set->data.str = malloc(ntohl(set->dataLen))) == NULL)
 180                 return (-1);
 181 -       if (fread(set->data.str, set->dataLen, 1, cat->fp) != 1) {
 182 +       if (fread(set->data.str, ntohl(set->dataLen), 1, cat->fp) != 1) {
 183                 saverr = errno;
 184                 free(set->data.str);
 185                 errno = saverr;
 186 @@ -465,13 +470,13 @@
 187         }
 188
 189         /* Get the messages */
 190 -       if (fseeko(cat->fp, set->u.firstMsg, SEEK_SET) == -1) {
 191 +       if (fseeko(cat->fp, ntohll(set->u.firstMsg), SEEK_SET) == -1) {
 192                 saverr = errno;
 193                 free(set->data.str);
 194                 errno = saverr;
 195                 return (0);
 196         }
 197 -       if ((set->u.msgs = (MCMsgT *)malloc(sizeof(MCMsgT) * set->numMsgs)) ==
 198 +       if ((set->u.msgs = (MCMsgT *)malloc(sizeof(MCMsgT) * ntohl(set->numMsgs))) ==
 199             NULL) {
 200                 saverr = errno;
 201                 free(set->data.str);
 202 @@ -479,7 +484,7 @@
 203                 return (-1);
 204         }
 205
 206 -       for (i = 0; i < set->numMsgs; ++i) {
 207 +       for (i = 0; i < ntohl(set->numMsgs); ++i) {
 208                 msg = set->u.msgs + i;
 209                 if (fread(msg, sizeof(*msg), 1, cat->fp) != 1) {
 210                         saverr = errno;
 211 @@ -492,7 +497,7 @@
 212                         --i;
 213                         continue;
 214                 }
 215 -               msg->msg.str = (char *)(set->data.str + msg->msg.off);
 216 +               msg->msg.str = (char *)(set->data.str + ntohll(msg->msg.off));
 217         }
 218         set->invalid = FALSE;
 219         return (1);