[BACK]Return to utf8.c CVS log [TXT][DIR] Up to [local] / src / usr.bin / tmux

Diff for /src/usr.bin/tmux/utf8.c between version 1.14 and 1.15

version 1.14, 2015/11/05 16:44:25 version 1.15, 2015/11/12 11:05:34
Line 394 
Line 394 
 int  int
 utf8_append(struct utf8_data *utf8data, u_char ch)  utf8_append(struct utf8_data *utf8data, u_char ch)
 {  {
           /* XXX this should do validity checks too! */
   
         if (utf8data->have >= utf8data->size)          if (utf8data->have >= utf8data->size)
                 fatalx("UTF-8 character overflow");                  fatalx("UTF-8 character overflow");
         if (utf8data->size > sizeof utf8data->data)          if (utf8data->size > sizeof utf8data->data)
Line 467 
Line 469 
         case 3:          case 3:
                 value = utf8data->data[2] & 0x3f;                  value = utf8data->data[2] & 0x3f;
                 value |= (utf8data->data[1] & 0x3f) << 6;                  value |= (utf8data->data[1] & 0x3f) << 6;
                 value |= (utf8data->data[0] & 0x0f) << 12;                  value |= (utf8data->data[0] & 0xf) << 12;
                 break;                  break;
         case 4:          case 4:
                 value = utf8data->data[3] & 0x3f;                  value = utf8data->data[3] & 0x3f;
                 value |= (utf8data->data[2] & 0x3f) << 6;                  value |= (utf8data->data[2] & 0x3f) << 6;
                 value |= (utf8data->data[1] & 0x3f) << 12;                  value |= (utf8data->data[1] & 0x3f) << 12;
                 value |= (utf8data->data[0] & 0x07) << 18;                  value |= (utf8data->data[0] & 0x7) << 18;
                 break;                  break;
         }          }
         return (value);          return (value);
   }
   
   /* Split a UTF-8 character. */
   int
   utf8_split(u_int uc, struct utf8_data *utf8data)
   {
           if (uc < 0x7f) {
                   utf8data->size = 1;
                   utf8data->data[0] = uc;
           } else if (uc < 0x7ff) {
                   utf8data->size = 2;
                   utf8data->data[0] = 0xc0 | ((uc >> 6) & 0x1f);
                   utf8data->data[1] = 0x80 | (uc & 0x3f);
           } else if (uc < 0xffff) {
                   utf8data->size = 3;
                   utf8data->data[0] = 0xe0 | ((uc >> 12) & 0xf);
                   utf8data->data[1] = 0x80 | ((uc >> 6) & 0x3f);
                   utf8data->data[2] = 0x80 | (uc & 0x3f);
           } else if (uc < 0x1fffff) {
                   utf8data->size = 4;
                   utf8data->data[0] = 0xf0 | ((uc >> 18) & 0x7);
                   utf8data->data[1] = 0x80 | ((uc >> 12) & 0x3f);
                   utf8data->data[2] = 0x80 | ((uc >> 6) & 0x3f);
                   utf8data->data[3] = 0x80 | (uc & 0x3f);
           } else
                   return (-1);
           utf8data->width = utf8_width(utf8data);
           return (0);
 }  }
   
 /* Split a two-byte UTF-8 character. */  /* Split a two-byte UTF-8 character. */
Legend:
Removed from v.1.14  
changed lines
  Added in v.1.15