Ticket #7142: stxttranslator-latin9.patch

src/add-ons/translators/stxt/STXTTranslator.cpp

@@ -188 +188 @@
 static int looks_utf8(const unsigned char *, size_t, my_unichar *, size_t *);
 static int looks_unicode(const unsigned char *, size_t, my_unichar *, size_t *);
 static int looks_latin1(const unsigned char *, size_t, my_unichar *, size_t *);
+static int looks_latin9(const unsigned char *, size_t, my_unichar *, size_t *);
 static int looks_extended(const unsigned char *, size_t, my_unichar *, size_t *);
 static void from_ebcdic(const unsigned char *, size_t, unsigned char *);
 static int ascmatch(const unsigned char *, const my_unichar *, size_t);
@@ -265 +266 @@
         code = "ISO-8859";
         type = "text";
         encoding = "iso-8859-1";
+    } else if (looks_latin9(buf, nbytes, ubuf, &ulen)) {
+        code = "ISO-8859";
+        type = "text";
+        encoding = "iso-8859-15";
     } else if (looks_extended(buf, nbytes, ubuf, &ulen)) {
         code = "Non-ISO extended-ASCII";
         type = "text";
@@ -280 +285 @@
             code = "International EBCDIC";
             type = "character data";
             encoding = "ebcdic";
+        } else if (looks_latin9(nbuf, nbytes, ubuf, &ulen)) {
+            code = "International EBCDIC";
+            type = "character data";
+            encoding = "ebcdic";
         } else {
             rv = 0;
             goto done;  /* doesn't look like text at all */
@@ -520 +529 @@
     I, I, I, I, I, I, I, I, I, I, I, I, I, I, I, I   /* 0xfX */
 };
 
+static char tekst_chars[256] = {
+    /*                  BEL BS HT LF    FF CR    */
+    F, I, F, F, F, F, F, T, T, T, T, F, T, T, F, F,  /* 0x0X */
+        /*                              ESC          */
+    F, F, F, F, F, F, F, F, F, F, F, T, F, F, F, F,  /* 0x1X */
+    I, T, T, T, T, T, T, T, T, T, T, T, T, T, T, T,  /* 0x2X */
+    T, T, T, T, T, T, T, T, T, T, T, T, T, T, T, T,  /* 0x3X */
+    T, T, T, T, T, T, T, T, T, T, T, T, T, T, T, T,  /* 0x4X */
+    T, T, T, T, T, T, T, T, T, T, T, T, T, T, T, T,  /* 0x5X */
+    I, I, T, T, T, T, T, T, T, T, T, T, T, T, T, T,  /* 0x6X */
+    T, T, T, T, T, T, T, T, T, T, T, T, T, I, I, F,  /* 0x7X */
+    /*            NEL                            */
+    X, X, X, X, X, T, X, X, X, X, X, X, X, X, X, X,  /* 0x8X */
+    X, X, I, X, X, X, X, X, X, X, X, X, X, X, X, X,  /* 0x9X */
+    I, I, I, I, I, I, I, I, I, I, I, I, I, I, I, I,  /* 0xaX */
+    I, I, I, I, I, I, I, I, I, I, I, I, I, I, I, I,  /* 0xbX */
+    I, I, I, I, I, I, I, I, I, I, I, I, I, I, I, I,  /* 0xcX */
+    I, I, I, I, I, I, I, I, I, I, I, I, I, I, I, I,  /* 0xdX */
+    I, I, I, I, I, I, I, I, I, I, I, I, I, I, I, I,  /* 0xeX */
+    I, I, I, I, I, I, I, I, I, I, I, I, I, I, I, I   /* 0xfX */
+};
+
 static int
 looks_ascii(const unsigned char *buf, size_t nbytes, my_unichar *ubuf,
     size_t *ulen)
@@ -560 +591 @@
 }
 
 static int
+looks_latin9(const unsigned char *buf, size_t nbytes, my_unichar *ubuf, size_t *ulen)
+{
+    int i;
+
+    *ulen = 0;
+
+    for (i = 0; i < (int)nbytes; i++) {
+        int t = tekst_chars[buf[i]];
+
+        if (t != T && t != I)
+            return 0;
+
+        ubuf[(*ulen)++] = buf[i];
+    }
+
+    return 1;
+}
+
+static int
 looks_extended(const unsigned char *buf, size_t nbytes, my_unichar *ubuf,
     size_t *ulen)
 {