sync with 0.8.1cvs15
authorPaul Mangan <paul@claws-mail.org>
Tue, 6 Aug 2002 22:05:47 +0000 (22:05 +0000)
committerPaul Mangan <paul@claws-mail.org>
Tue, 6 Aug 2002 22:05:47 +0000 (22:05 +0000)
ChangeLog
ChangeLog.claws
ChangeLog.jp
src/utils.c

index 1ac10bb..054924a 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,8 @@
 2002-08-06
 
        * src/prefs_common.[ch]: removed obsolete default sign key setting.
+       * src/utils.c: canonicalize_file(): correct the error check of
+         fwrite().
 
 2002-08-06
 
index d640b90..c992008 100644 (file)
@@ -1,3 +1,8 @@
+2002-08-06 [paul]      0.8.1claws29
+
+       * sync with 0.8.cvs15
+               see ChangeLog 2002-08-06
+
 2002-08-06 [oliver]    0.8.1claws28
 
        * src/toolbar.c
index 505fd7e..94337c2 100644 (file)
@@ -1,6 +1,8 @@
 2002-08-06
 
        * src/prefs_common.[ch]: obsolete ¤Ê¥Ç¥Õ¥©¥ë¥È½ð̾¸°¤ÎÀßÄê¤òºï½ü¡£
+       * src/utils.c: canonicalize_file(): fwrite() ¤Î¥¨¥é¡¼¥Á¥§¥Ã¥¯¤ò
+         ÄûÀµ¡£
 
 2002-08-06
 
index c072f74..a353d43 100644 (file)
@@ -2116,8 +2116,11 @@ gint canonicalize_file(const gchar *src, const gchar *dest)
                } else if (len > 1 && buf[len - 1] == '\n' && buf[len - 2] == '\r') {
                        r = fputs(buf, dest_fp);
                } else {
-                       if (len > 1)
+                       if (len > 1) {
                                r = fwrite(buf, len - 1, 1, dest_fp);
+                               if (r != 1)
+                                       r = EOF;
+                       }
                        if (r != EOF)
                                r = fputs("\r\n", dest_fp);
                }