Changed union for yylval.

[gedcom-parse.git] / encoding.c

diff --git a/encoding.c b/encoding.c
index 6c342e0ccba4fe2817eab3f553287efe89a47c72..1104f681999a6e2664f73e38c60cd0a4e0cf69ad 100644 (file)
--- a/encoding.c
+++ b/encoding.c
@@ -1,3 +1,15 @@
+/*  This program is free software; you can redistribute it and/or modify  *
+ *  it under the terms of the GNU General Public License as published by  *
+ *  the Free Software Foundation; either version 2 of the License, or     *
+ *  (at your option) any later version.                                   *
+
+ (C) 2001 by The Genes Development Team
+ Original author: Peter Verthez (Peter.Verthez@advalvas.be)
+*/
+
+/* $Id$ */
+/* $Name$ */
+
 #include <string.h>
 #include <iconv.h>
 #include <search.h>
@@ -76,7 +88,7 @@ void init_encodings()
                       ENCODING_CONF_FILE);
          return;
        }
-       else if (buffer[0] != '#') {
+       else if ((buffer[0] != '#') && (strcmp(buffer, "\n") != 0)) {
          if (sscanf(buffer, "%s %s %s", gedcom_n, charwidth, iconv_n) == 3) {
            add_encoding(gedcom_n, charwidth, iconv_n);
          }
@@ -102,7 +114,7 @@ void set_encoding_width(ENCODING enc)
 }
 
 static char conv_buf[MAXGEDCLINELEN * 2];
-static int conv_buf_size;
+static size_t conv_buf_size;
 
 int open_conv_to_internal(char* fromcode)
 {
@@ -116,6 +128,10 @@ int open_conv_to_internal(char* fromcode)
     memset(conv_buf, 0, sizeof(conv_buf));
     conv_buf_size = 0;
     cd_to_internal = iconv_open(INTERNAL_ENCODING, encoding);
+    if (cd_to_internal == (iconv_t) -1) {
+      gedcom_error("Error opening conversion context for encoding %s: %s",
+                  encoding, strerror(errno));
+    }
   }
   return (cd_to_internal != (iconv_t) -1);  
 }
@@ -128,7 +144,6 @@ void close_conv_to_internal()
 
 char* to_internal(char* str, size_t len)
 {
-  size_t insize;
   size_t outsize = MAXGEDCLINELEN * 2;
   char *wrptr = int_buf;
   char *rdptr = conv_buf;
@@ -136,15 +151,13 @@ char* to_internal(char* str, size_t len)
   /* can't use strcpy, because possible null bytes from unicode */
   memcpy(conv_buf + conv_buf_size, str, len);
   conv_buf_size += len;
-  insize = conv_buf_size;
   /* set up output buffer (empty it) */
   memset(int_buf, 0, sizeof(int_buf));
   /* do the conversion */
-  iconv(cd_to_internal, &rdptr, &insize, &wrptr, &outsize);
+  iconv(cd_to_internal, &rdptr, &conv_buf_size, &wrptr, &outsize);
   /* then shift what is left over to the head of the input buffer */
-  memmove(conv_buf, rdptr, insize);
-  memset(conv_buf + insize, 0, sizeof(conv_buf) - insize);
-  conv_buf_size = insize;
+  memmove(conv_buf, rdptr, conv_buf_size);
+  memset(conv_buf + conv_buf_size, 0, sizeof(conv_buf) - conv_buf_size);
   return int_buf;
 }