X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=util%2Fsiconvtst.c;h=9f7038ece3b62d255e79c8ebf4be86812068a17b;hb=a84b343fd22845cbd7bea563e77250a84e48463b;hp=c06befe6405cdc2c90320b96ba5690a3fa91cac7;hpb=7dec30565506b5ecdd449866ebabe67bd816fc59;p=yaz-moved-to-github.git

diff --git a/util/siconvtst.c b/util/siconvtst.c
index c06befe..9f7038e 100644
--- a/util/siconvtst.c
+++ b/util/siconvtst.c
@@ -1,8 +1,8 @@
 /*
- * Copyright (c) 1997-2002, Index Data
+ * Copyright (c) 1997-2003, Index Data
  * See the file LICENSE for details.
  *
- * $Id: siconvtst.c,v 1.1 2002-08-27 14:02:13 adam Exp $
+ * $Id: siconvtst.c,v 1.8 2003-01-06 08:20:28 adam Exp $
  */
 
 #if HAVE_CONFIG_H
@@ -15,53 +15,84 @@
 
 #include <yaz/yaz-util.h>
 
-#define CHUNK 8
+#define CHUNK_IN 64
+#define CHUNK_OUT 64
 
-static void convert (FILE *inf, yaz_iconv_t cd)
+void convert (FILE *inf, yaz_iconv_t cd, int verbose)
 {
-    char inbuf0[CHUNK], *inbuf = inbuf0;
-    char outbuf0[CHUNK], *outbuf = outbuf0;
-    size_t outbytesleft = CHUNK;
-    size_t inbytesleft = CHUNK;
+    char inbuf0[CHUNK_IN], *inbuf = inbuf0;
+    char outbuf0[CHUNK_OUT], *outbuf = outbuf0;
+    size_t inbytesleft = CHUNK_IN;
+    size_t outbytesleft = CHUNK_OUT;
+    int mustread = 1;
 
     while (1)
     {
-        size_t r = fread (inbuf, 1, inbytesleft, inf);
-        if (inbytesleft != r)
+        size_t r;
+        if (mustread)
         {
-            if (ferror(inf))
+            r = fread (inbuf, 1, inbytesleft, inf);
+            if (inbytesleft != r)
             {
-                fprintf (stderr, "yaziconv: error reading file\n");
-                exit (6);
-            }
-            if (r == 0)
-            {
-                if (outbuf != outbuf0)
-                    fwrite (outbuf0, 1, outbuf - outbuf0, stdout);
-                break;
+                if (ferror(inf))
+                {
+                    fprintf (stderr, "yaziconv: error reading file\n");
+                    exit (6);
+                }
+                if (r == 0)
+                {
+                    if (outbuf != outbuf0)
+                        fwrite (outbuf0, 1, outbuf - outbuf0, stdout);
+                    break;
+                }
+                inbytesleft = r;
             }
         }
+        if (verbose > 1)
+        {
+            fprintf (stderr, "yaz_iconv: inbytesleft=%d outbytesleft=%d\n",
+                     inbytesleft, outbytesleft);
+
+        }
         r = yaz_iconv (cd, &inbuf, &inbytesleft, &outbuf, &outbytesleft);
         if (r == (size_t)(-1))
         {
-            if (yaz_iconv_error(cd) == YAZ_ICONV_EILSEQ)
+            int e = yaz_iconv_error(cd);
+            if (e == YAZ_ICONV_EILSEQ)
             {
                 fprintf (stderr, "invalid sequence\n");
                 return ;
             }
-
-            if (yaz_iconv_error(cd) == EINVAL) /* incomplete input */
+            else if (e == YAZ_ICONV_EINVAL) /* incomplete input */
             { 
                 size_t i;
                 for (i = 0; i<inbytesleft; i++)
                     inbuf0[i] = inbuf[i];
-                inbytesleft = CHUNK - inbytesleft;
+
+                r = fread(inbuf0 + i, 1, CHUNK_IN - i, inf);
+                if (r != CHUNK_IN - i)
+                {
+                    if (ferror(inf))
+                    {
+                        fprintf (stderr, "yaziconv: error reading file\n");
+                        exit(6);
+                    }
+                }
+                if (r == 0)
+                {
+                    fprintf (stderr, "invalid sequence\n");
+                    return ;
+                }
+                inbytesleft += r;
+                inbuf = inbuf0;
+                mustread = 0;
             }
-            if (yaz_iconv_error(cd) == E2BIG) /* no more output space */
+            else if (e == YAZ_ICONV_E2BIG) /* no more output space */
             {
                 fwrite (outbuf0, 1, outbuf - outbuf0, stdout);
                 outbuf = outbuf0;
-                outbytesleft = CHUNK;
+                outbytesleft = CHUNK_OUT;
+                mustread = 0;
             }
             else
             {
@@ -72,7 +103,13 @@ static void convert (FILE *inf, yaz_iconv_t cd)
         else
         {
             inbuf = inbuf0;
-            inbytesleft = CHUNK;
+            inbytesleft = CHUNK_IN;
+
+            fwrite (outbuf0, 1, outbuf - outbuf0, stdout);
+            outbuf = outbuf0;
+            outbytesleft = CHUNK_OUT;
+
+            mustread = 1;
         }
     }
 }
@@ -80,13 +117,14 @@ static void convert (FILE *inf, yaz_iconv_t cd)
 int main (int argc, char **argv)
 {
     int ret;
+    int verbose = 0;
     char *from = 0;
     char *to = 0;
     char *arg;
     yaz_iconv_t cd;
     FILE *inf = stdin;
 
-    while ((ret = options ("f:t:", argv, argc, &arg)) != -2)
+    while ((ret = options ("vf:t:", argv, argc, &arg)) != -2)
     {
         switch (ret)
         {
@@ -104,9 +142,12 @@ int main (int argc, char **argv)
         case 't':
             to = arg;
             break;
+        case 'v':
+            verbose++;
+            break;
         default:
             fprintf (stderr, "yaziconv: Usage\n"
-                     "siconv -f encoding -t encoding [file]\n");
+                     "siconv -f encoding -t encoding [-v] [file]\n");
             exit(1);
         }
     }
@@ -126,7 +167,15 @@ int main (int argc, char **argv)
         fprintf (stderr, "yaziconv: unsupported encoding\n");
         exit (5);
     }
-
-    
+    else
+    {
+        if (verbose)
+        {
+            fprintf (stderr, "yaziconv: using %s\n",
+                     yaz_iconv_isbuiltin(cd) ? "YAZ" : "iconv");
+        }
+    }
+    convert (inf, cd, verbose);
     yaz_iconv_close (cd);
+    return 0;
 }