(encode_eol): Fix typo that prevented converting to Mac

line endings.  Always update dst_bytes to number of bytes actually copied.
(decode_eol): Fix value of coding->produced when decoding Unix
line endings (in case this function is ever used for that).

diff --git a/src/coding.c b/src/coding.c
index 36376b83ede3dfd70a4145a3840c2f4b1c69bd47..f6945d0730837e1c3f3bcf65bb05f715c34863b3 100644 (file)
--- a/src/coding.c
+++ b/src/coding.c
@@ -2595,7 +2595,7 @@ decode_eol (coding, source, destination, src_bytes, dst_bytes)
       else
        safe_bcopy (source, destination, src_bytes);
       src += src_bytes;
-      dst += dst_bytes;
+      dst += src_bytes;
       coding->fake_multibyte = 1;
       break;
     }
@@ -2662,18 +2662,16 @@ encode_eol (coding, source, destination, src_bytes, dst_bytes)
       if (dst_bytes)
        bcopy (source, destination, src_bytes);
       else
-       {
-         safe_bcopy (source, destination, src_bytes);
-         dst_bytes = src_bytes;
-       }
-      if (coding->eol_type == CODING_EOL_CRLF)
+       safe_bcopy (source, destination, src_bytes);
+      dst_bytes = src_bytes;
+      if (coding->eol_type == CODING_EOL_CR)
        {
          while (src_bytes--)
            {
              if ((c = *dst++) == '\n')
                dst[-1] = '\r';
              else if (BASE_LEADING_CODE_P (c))
-                 coding->fake_multibyte = 1;
+               coding->fake_multibyte = 1;
            }
        }
       else