- return AFPERR_BITMAP;
- }
-
- /* output format:
- * message type: 2 bytes
- * bitmap: 2 bytes
- * message length: 1 byte
- * message: up to 199 bytes
- */
- memcpy(rbuf, &type, sizeof(type));
- rbuf += sizeof(type);
- memcpy(rbuf, &bitmap, sizeof(bitmap));
- rbuf += sizeof(bitmap);
- *rbuflen = strlen(message);
- if (*rbuflen > MAXMESGSIZE)
- *rbuflen = MAXMESGSIZE;
- *rbuf++ = *rbuflen;
- memcpy(rbuf, message, *rbuflen);
-
- *rbuflen += 5;
-
- return AFP_OK;
+
+ msgsize = MAX(obj->dsi->attn_quantum, MAXMESGSIZE);
+
+ memcpy(&type, ibuf + 2, sizeof(type));
+ memcpy(&bitmap, ibuf + 4, sizeof(bitmap));
+
+ message = servermesg;
+ switch (ntohs(type)) {
+ case AFPMESG_LOGIN: /* login */
+ /* at least TIGER loses server messages
+ * if it receives a server msg attention before
+ * it has asked the login msg...
+ * Workaround: concatenate the two if any, ugly.
+ */
+ if (obj->options.loginmesg) {
+ if (*message)
+ strlcat(message, " - ", MAXMESGSIZE);
+ strlcat(message, obj->options.loginmesg, MAXMESGSIZE);
+ }
+ break;
+ case AFPMESG_SERVER: /* server */
+ break;
+ default:
+ return AFPERR_BITMAP;
+ }
+
+ /* output format:
+ * message type: 2 bytes
+ * bitmap: 2 bytes
+ * message length: 1 byte ( 2 bytes for utf8)
+ * message: up to 199 bytes (dsi attn_quantum for utf8)
+ */
+ memcpy(rbuf, &type, sizeof(type));
+ rbuf += sizeof(type);
+ *rbuflen += sizeof(type);
+ memcpy(rbuf, &bitmap, sizeof(bitmap));
+ rbuf += sizeof(bitmap);
+ *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;
+// *message = 0;
+ return AFP_OK;