- *rbuflen = strlen(message);
- if (*rbuflen > MAXMESGSIZE)
- *rbuflen = MAXMESGSIZE;
- *rbuf++ = *rbuflen;
- memcpy(rbuf, message, *rbuflen);
-
- *rbuflen += 5;
+ *rbuflen += sizeof(bitmap);
+
+ utf8 = ntohs(bitmap) & 2;
+ msglen = strlen(message);
+ if (msglen > msgsize)
+ msglen = msgsize;
+
+ if (msglen) {
+ if ( (size_t)-1 == (outlen = convert_string(obj->options.unixcharset, utf8?CH_UTF8_MAC:obj->options.maccharset,
+ message, msglen, localized_message, msgsize)) )
+ {
+ memcpy(rbuf+((utf8)?2:1), message, msglen); /*FIXME*/
+ outlen = msglen;
+ }
+ else
+ {
+ memcpy(rbuf+((utf8)?2:1), localized_message, outlen);
+ }
+ }
+
+ if ( utf8 ) {
+ /* UTF8 message, 2 byte length */
+ msgsize = htons(outlen);
+ memcpy(rbuf, &msgsize, sizeof(msgsize));
+ *rbuflen += sizeof(msgsize);
+ }
+ else {
+ *rbuf = outlen;
+ *rbuflen += 1;
+ }
+ *rbuflen += outlen;