inkf - yet another network kanji filter

とりあえず、-Sj が壊れている問題と、cygwin 環境で distclean 時にごみが残る問題のパッチ。configure は正直見る気が起きない。

# sjis_to_eucjp と sjis_to_jis のロジックが全く別で、一方が壊れているのはどうかと思う。
------>8------------>8------------>8------------>8------------>8
diff -aurN inkf-1.0.6.orig/configure inkf-1.0.6/configure
--- inkf-1.0.6.orig/configure 2009-07-29 19:52:53.000000000 +0900
+++ inkf-1.0.6/configure 2009-09-15 23:22:09.000000000 +0900
@@ -55,6 +55,7 @@
WITH_OPENSSL=0
fi
${RM} conftest.cc
+ ${RM} conftest.exe
fi

for arg in $@; do
diff -aurN inkf-1.0.6.orig/libapolloron/.DS_Store inkf-1.0.6/libapolloron/.DS_Store
diff -aurN inkf-1.0.6.orig/libapolloron/src/charset.cc inkf-1.0.6/libapolloron/src/charset.cc
--- inkf-1.0.6.orig/libapolloron/src/charset.cc 2009-07-29 19:48:57.000000000 +0900
+++ inkf-1.0.6/libapolloron/src/charset.cc 2009-09-15 23:21:48.000000000 +0900
@@ -1638,8 +1638,8 @@
i = 0;
j = 0;
while (i < length) {
- a0 = (unsigned char)str[i++];
- if (0x81 < (unsigned char)str[i] && (unsigned char)str[i] <= 0x9F) {
+ a0 = (unsigned char)str[i];
+ if (0x81 <= (unsigned char)str[i] && (unsigned char)str[i] <= 0x9F) {
// Kanji
// From division 1 to division 62
a1 = str[i+1];
@@ -1665,7 +1665,7 @@
}
buf[j++] = a0;
buf[j] = a1;
- i++;
+ i += 2;
} else if (0xE0 <= (unsigned char)str[i] && (unsigned char)str[i] <= 0xF9) {
// From division 63 to division 94
a0 = (str[i] - 0xE0) << 1;
@@ -1689,7 +1689,7 @@
}
buf[j++] = a0;
buf[j] = a1;
- i++;
+ i += 2;
} else if (0xFA <= (unsigned char)str[i] && (unsigned char)str[i] <= 0xFC) {
// From division 115 to division 119 to CP50220
unsigned char s1;
@@ -1716,7 +1716,7 @@
}
buf[j++] = (linear - 0x819E) / 94;
buf[j] = (linear % 94) + 0x21;
- i++;
+ i += 2;
} else {
// Non-Kanji
if (jiskanji) {
@@ -1726,9 +1726,9 @@
jiskanji = 0;
}
buf[j] = str[i];
+ i += 2;
}
j++;
- i++;
}

if (jiskanji) {
------>8------------>8------------>8------------>8------------>8