Write encoding is by default the read encoding.

Extra argument for setting encoding.

diff --git a/gedcom/write.c b/gedcom/write.c
index 1e44ff46476b5a12c92bde65786b765c8cb56323..7554b560ea7832163748df254fd4926ffec76a9f 100644 (file)
--- a/gedcom/write.c
+++ b/gedcom/write.c
@@ -37,6 +37,8 @@
 /* SYS_NEWLINE is defined in config.h */
 struct encoding_state write_encoding =
 { "ASCII", "ASCII", ONE_BYTE, WITHOUT_BOM, SYS_NEWLINE };
+Enc_from write_encoding_from   = ENC_FROM_FILE;
+Enc_from write_terminator_from = ENC_FROM_SYS;
 
 struct Gedcom_write_struct {
   int       filedesc;
@@ -199,20 +201,37 @@ int write_long(Gedcom_write_hndl hndl, int elt_or_rec,
   return 0;
 }
 
-int gedcom_write_set_encoding(const char* new_charset,
+int gedcom_write_set_encoding(Enc_from from, const char* new_charset,
                              Encoding width, Enc_bom bom)
 {
   char* new_encoding = NULL;
-  if (!strcmp(new_charset, "UNICODE")) {
-    if (width == ONE_BYTE) {
-      gedcom_error(_("Unicode cannot be encoded into one byte"));
-      return 1;
+  if (from == ENC_FROM_SYS) {
+    return 1;
+  }
+  write_encoding_from = from;
+  if (from == ENC_MANUAL) {
+    if (!strcmp(new_charset, "UNICODE")) {
+      if (width == ONE_BYTE) {
+       gedcom_error(_("Unicode cannot be encoded into one byte"));
+       return 1;
+      }
+      else {
+       new_encoding = get_encoding(new_charset, width);
+       if (new_encoding) {
+         write_encoding.encoding = new_encoding;
+         write_encoding.width = width;
+         write_encoding.bom   = bom;
+         strncpy(write_encoding.charset, new_charset, MAX_CHARSET_LEN);
+       }
+       else
+         return 1;
+      }
     }
     else {
-      new_encoding = get_encoding(new_charset, width);
+      new_encoding = get_encoding(new_charset, ONE_BYTE);
       if (new_encoding) {
        write_encoding.encoding = new_encoding;
-       write_encoding.width = width;
+       write_encoding.width = ONE_BYTE;
        write_encoding.bom   = bom;
        strncpy(write_encoding.charset, new_charset, MAX_CHARSET_LEN);
       }
@@ -220,26 +239,42 @@ int gedcom_write_set_encoding(const char* new_charset,
        return 1;
     }
   }
-  else {
-    new_encoding = get_encoding(new_charset, ONE_BYTE);
-    if (new_encoding) {
-      write_encoding.encoding = new_encoding;
-      write_encoding.width = ONE_BYTE;
-      write_encoding.bom   = bom;
-      strncpy(write_encoding.charset, new_charset, MAX_CHARSET_LEN);
-    }
-    else
-      return 1;
-  }
   return 0;
 }
 
-int gedcom_write_set_line_terminator(Enc_line_end end)
+void copy_write_encoding_from_file()
+{
+  if (read_encoding.charset[0] != '\0') {
+    strncpy(write_encoding.charset, read_encoding.charset, MAX_CHARSET_LEN);
+    write_encoding.encoding = read_encoding.encoding;
+    write_encoding.width    = read_encoding.width;
+    write_encoding.bom      = read_encoding.bom;
+  }
+}
+
+int gedcom_write_set_line_terminator(Enc_from from, Enc_line_end end)
 {
-  strncpy(write_encoding.terminator, terminator[end], MAX_TERMINATOR_LEN);
+  const char* new_term = NULL;
+  write_terminator_from = from;
+  if (from == ENC_FROM_SYS) {
+    new_term = SYS_NEWLINE;
+  }
+  else if (from == ENC_MANUAL) {
+    new_term = terminator[end];
+  }
+  if (new_term)
+    strncpy(write_encoding.terminator, new_term, MAX_TERMINATOR_LEN);
   return 0;
 }
 
+void copy_write_terminator_from_file()
+{
+  if (read_encoding.terminator[0] != '\0') {
+    strncpy(write_encoding.terminator, read_encoding.terminator,
+           MAX_TERMINATOR_LEN);
+  }
+}
+
 Gedcom_write_hndl gedcom_write_open(const char *filename)
 {
   Gedcom_write_hndl hndl;
@@ -249,6 +284,10 @@ Gedcom_write_hndl gedcom_write_open(const char *filename)
   if (!hndl)
     MEMORY_ERROR;
   else {
+    if (write_encoding_from == ENC_FROM_FILE)
+      copy_write_encoding_from_file();
+    if (write_terminator_from == ENC_FROM_FILE)
+      copy_write_terminator_from_file();
     hndl->total_conv_fails = 0;
     hndl->conv = initialize_utf8_conversion(write_encoding.encoding, 0);
     if (!hndl->conv) {