--- a/config/version	Wed Apr 20 00:25:01 2005 +0900
+++ b/config/version	Wed Apr 20 14:39:40 2005 +0900
@@ -1,1 +1,1 @@
-6.8.3.33
+6.8.3.34

--- a/config/version.c	Wed Apr 20 00:25:01 2005 +0900
+++ b/config/version.c	Wed Apr 20 14:39:40 2005 +0900
@@ -1,5 +1,5 @@
 #ifndef JAPAN
-char *version = "@(#)MH 6.8.3 #33[UCI] (leo.ie.u-ryukyu.ac.jp) of Wed Apr 20 00:16:31 JST 2005";
+char *version = "@(#)MH 6.8.3 #34[UCI] (leo.ie.u-ryukyu.ac.jp) of Wed Apr 20 14:24:42 JST 2005";
 #else /* JAPAN */
-char *version = "@(#)MH 6.8.3.JP-pre3.05-20010615 #33[UCI] (leo.ie.u-ryukyu.ac.jp) of Wed Apr 20 00:16:31 JST 2005";
+char *version = "@(#)MH 6.8.3.JP-pre3.05-20010615 #34[UCI] (leo.ie.u-ryukyu.ac.jp) of Wed Apr 20 14:24:43 JST 2005";
 #endif /* JAPAN */

--- a/doc/version.rf	Wed Apr 20 00:25:01 2005 +0900
+++ b/doc/version.rf	Wed Apr 20 14:39:40 2005 +0900
@@ -1,1 +1,1 @@
-.ds MH 6.8.3 #33[UCI]
+.ds MH 6.8.3 #34[UCI]

--- a/ers	Wed Apr 20 00:25:01 2005 +0900
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,74 +0,0 @@
-for d in config sbr mts zotnet uip support doc; do (cd $d; make DESTDIR=  -k all); done
-MH 6.8.3 #5[UCI]
-Japanization Plus pre3.05-20010615
-gcc -DATHENA -DDUMB -DFOLDPROT='"0700"' -DGCOS_HACK -DISI -DMHE -DMHRC -DMSGPROT='"0600"' -DOVERHEAD -DRPATHS -DSBACKUP='"\043"' -DWHATNOW -DBIND -DBSD42 -DBSD43 -DBSD44 -DDBMPWD -DNORUSERPASS -DPOSIX -DSETMG -DSYS5DIR -DUNISTD -DVSPRINTF -DWAITINT -DZONEINFO -DPOPSERVICE='"pop"' -DAPOP -DJAPAN -DMH_PLUS -DMIME -DMIME_HEADERS -DMORE='"/usr/local/bin/jless"' -DNNTP -DMAILGROUP -DSENDMTS -DSMTP -DPOP -DSPRINTFTYPE=int -DTYPESIG=void -O   -c -o version.o version.c
-gcc -DATHENA -DDUMB -DFOLDPROT='"0700"' -DGCOS_HACK -DISI -DMHE -DMHRC -DMSGPROT='"0600"' -DOVERHEAD -DRPATHS -DSBACKUP='"\043"' -DWHATNOW -DBIND -DBSD42 -DBSD43 -DBSD44 -DDBMPWD -DNORUSERPASS -DPOSIX -DSETMG -DSYS5DIR -DUNISTD -DVSPRINTF -DWAITINT -DZONEINFO -DPOPSERVICE='"pop"' -DAPOP -DJAPAN -DMH_PLUS -DMIME -DMIME_HEADERS -DMORE='"/usr/local/bin/jless"' -DNNTP -DMAILGROUP -DSENDMTS -DSMTP -DPOP -DSPRINTFTYPE=int -DTYPESIG=void -O -c concat.c
-In file included from concat.c:5:
-/usr/include/gcc/darwin/3.3/varargs.h:10:2: #error "GCC no longer implements <varargs.h>."
-/usr/include/gcc/darwin/3.3/varargs.h:11:2: #error "Revise your code to use <stdarg.h>."
-concat.c:11: error: parse error before "va_dcl"
-concat.c:12: error: syntax error before '{' token
-concat.c:17: error: parse error before "list"
-concat.c:17: warning: data definition has no type or storage class
-concat.c:19: error: conflicting types for `len'
-concat.c:16: error: previous declaration of `len'
-concat.c:19: warning: data definition has no type or storage class
-concat.c:20: warning: parameter names (without types) in function declaration
-concat.c:20: warning: data definition has no type or storage class
-concat.c:21: error: parse error before "while"
-concat.c:23: warning: parameter names (without types) in function declaration
-concat.c:23: warning: data definition has no type or storage class
-concat.c:25: error: `sp' undeclared here (not in a function)
-concat.c:25: warning: data definition has no type or storage class
-concat.c:26: error: parse error before "if"
-concat.c:29: warning: parameter names (without types) in function declaration
-concat.c:29: warning: data definition has no type or storage class
-concat.c:30: error: parse error before "while"
-concat.c:32: warning: parameter names (without types) in function declaration
-concat.c:32: warning: data definition has no type or storage class
-concat.c:34: error: parse error before "return"
-make[1]: *** [concat.o] Error 1
-gcc -DATHENA -DDUMB -DFOLDPROT='"0700"' -DGCOS_HACK -DISI -DMHE -DMHRC -DMSGPROT='"0600"' -DOVERHEAD -DRPATHS -DSBACKUP='"\043"' -DWHATNOW -DBIND -DBSD42 -DBSD43 -DBSD44 -DDBMPWD -DNORUSERPASS -DPOSIX -DSETMG -DSYS5DIR -DUNISTD -DVSPRINTF -DWAITINT -DZONEINFO -DPOPSERVICE='"pop"' -DAPOP -DJAPAN -DMH_PLUS -DMIME -DMIME_HEADERS -DMORE='"/usr/local/bin/jless"' -DNNTP -DMAILGROUP -DSENDMTS -DSMTP -DPOP -DSPRINTFTYPE=int -DTYPESIG=void -O -c ml_codeconv.c
-ml_codeconv.c: In function `utf8_fputs':
-ml_codeconv.c:263: error: `my_pretty' undeclared (first use in this function)
-ml_codeconv.c:263: error: (Each undeclared identifier is reported only once
-ml_codeconv.c:263: error: for each function it appears in.)
-ml_codeconv.c: In function `ml_conv_sbr':
-ml_codeconv.c:448: error: `ptr' undeclared (first use in this function)
-ml_codeconv.c:448: error: `len' undeclared (first use in this function)
-ml_codeconv.c: At top level:
-ml_codeconv.c:590: error: `my_pretty' used prior to declaration
-ml_codeconv.c: In function `my_pretty':
-ml_codeconv.c:595: error: `u1' undeclared (first use in this function)
-ml_codeconv.c:595: error: `stream' undeclared (first use in this function)
-make[1]: *** [ml_codeconv.o] Error 1
-make[1]: Target `all' not remade because of errors.
-for d in sendmail; do (cd $d; make DESTDIR= -k all); done
-make[2]: Nothing to be done for `all'.
-for d in mts bboards tws mf; do (cd $d; make DESTDIR= -k all); done
-gcc -DATHENA -DDUMB -DFOLDPROT='"0700"' -DGCOS_HACK -DISI -DMHE -DMHRC -DMSGPROT='"0600"' -DOVERHEAD -DRPATHS -DSBACKUP='"\043"' -DWHATNOW -DBIND -DBSD42 -DBSD43 -DBSD44 -DDBMPWD -DNORUSERPASS -DPOSIX -DSETMG -DSYS5DIR -DUNISTD -DVSPRINTF -DWAITINT -DZONEINFO -DPOPSERVICE='"pop"' -DAPOP -DJAPAN -DMH_PLUS -DMIME -DMIME_HEADERS -DMORE='"/usr/local/bin/jless"' -DNNTP -DMAILGROUP -DSENDMTS -DSMTP -DPOP -DSPRINTFTYPE=int -DTYPESIG=void -O -I..   -c -o client.o client.c
-client.c:367: error: conflicting types for `inet_addr'
-/usr/include/arpa/inet.h:101: error: previous declaration of `inet_addr'
-make[2]: *** [client.o] Error 1
-make[2]: Target `all' not remade because of errors.
-make[2]: Nothing to be done for `all'.
-make[2]: Nothing to be done for `all'.
-make[2]: Nothing to be done for `all'.
-gcc -DATHENA -DDUMB -DFOLDPROT='"0700"' -DGCOS_HACK -DISI -DMHE -DMHRC -DMSGPROT='"0600"' -DOVERHEAD -DRPATHS -DSBACKUP='"\043"' -DWHATNOW -DBIND -DBSD42 -DBSD43 -DBSD44 -DDBMPWD -DNORUSERPASS -DPOSIX -DSETMG -DSYS5DIR -DUNISTD -DVSPRINTF -DWAITINT -DZONEINFO -DPOPSERVICE='"pop"' -DAPOP -DJAPAN -DMH_PLUS -DMIME -DMIME_HEADERS -DMORE='"/usr/local/bin/jless"' -DNNTP -DMAILGROUP -DSENDMTS -DSMTP -DPOP -DSPRINTFTYPE=int -DTYPESIG=void -O -I. -c mts/client.c
-mts/client.c:367: error: conflicting types for `inet_addr'
-/usr/include/arpa/inet.h:101: error: previous declaration of `inet_addr'
-make[1]: *** [mts/client.o] Error 1
-make[1]: Target `all' not remade because of errors.
-make[1]: *** No rule to make target `../sbr/libmh.a', needed by `xali'.
-make[1]: *** No rule to make target `../zotnet/libzot.a', needed by `xali'.
-gcc -DATHENA -DDUMB -DFOLDPROT='"0700"' -DGCOS_HACK -DISI -DMHE -DMHRC -DMSGPROT='"0600"' -DOVERHEAD -DRPATHS -DSBACKUP='"\043"' -DWHATNOW -DBIND -DBSD42 -DBSD43 -DBSD44 -DDBMPWD -DNORUSERPASS -DPOSIX -DSETMG -DSYS5DIR -DUNISTD -DVSPRINTF -DWAITINT -DZONEINFO -DPOPSERVICE='"pop"' -DAPOP -DJAPAN -DMH_PLUS -DMIME -DMIME_HEADERS -DMORE='"/usr/local/bin/jless"' -DNNTP -DMAILGROUP -DSENDMTS -DSMTP -DPOP -DSPRINTFTYPE=int -DTYPESIG=void -O   -c -o vmh.o vmh.c
-vmh.c: In function `linsert':
-vmh.c:1401: error: invalid use of undefined type `struct ldat'
-vmh.c:1401: error: dereferencing pointer to incomplete type
-make[1]: *** [vmh.o] Error 1
-make[1]: Target `all' not remade because of errors.
-for d in bboards general pop; do (cd $d; make DESTDIR= -k all); done
-make[2]: Nothing to be done for `all'.
-make[2]: `all' is up to date.
-make[2]: Nothing to be done for `all'.
-make[1]: Nothing to be done for `all'.

--- a/sbr/ml_exthdr.c	Wed Apr 20 00:25:01 2005 +0900
+++ b/sbr/ml_exthdr.c	Wed Apr 20 14:39:40 2005 +0900
@@ -722,6 +722,13 @@
 	    if (*tmp++ != '-') return(-1);
 	}
     }
+    if (uleq(buf, "utf-8")) {
+	int i;
+	ml_conv(buf);
+	for(i=0;i<BUFSIZ-1 && ip <= ep;i++) *op++ = *ip++;
+	if (i==BUFSIZ-1) *op++=0;
+	return i;
+    }
     if (!uleq(buf, "us-ascii") && (!mm_charset || !uleq(buf, mm_charset)))
 	return(-1);
     ip = cp + 1;