more sync with sylpheed 0.7.0cvs15

diff --git a/ChangeLog b/ChangeLog
index 8642ac1f87614c6a90f72586339e1472a913230e..fc48a22ae9f97c83c0be34e026eb2adc56e1777f 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,6 +3,8 @@
        * src/compose.c
          src/gtkstext.[ch]: removed the hardcoded shortcuts in GtkSText,
          and made them customizable.
+       * src/utils.[ch]: added get_file_size_as_crlf() which returns
+         the file size when converting LF to CR+LF.
 
 2002-01-22
 

diff --git a/ChangeLog.claws b/ChangeLog.claws
index aaa1a201109a706cff591da2d5f8a7afee4d2469..bb8b872ede1025061ee188113106c08649c9603d 100644 (file)
--- a/ChangeLog.claws
+++ b/ChangeLog.claws
@@ -1,3 +1,8 @@
+2002-01-24 [paul]      0.7.0claws24
+
+       * more sync with sylpheed 0.7.0cvs15
+               get_file_size_as_clrf(), see ChangeLog entry 2002-01-23
+
 2002-01-23 [sergey]    0.7.0claws23
 
        * src/importldif.c

diff --git a/ChangeLog.jp b/ChangeLog.jp
index 2bf02fef9e46e4ccd025f84417e5969ff580e79a..0de66e24b872742fe5e576193e8526dbcce65fd7 100644 (file)
--- a/ChangeLog.jp
+++ b/ChangeLog.jp
@@ -3,6 +3,8 @@
        * src/compose.c
          src/gtkstext.[ch]: GtkSText Ãæ¤Î¥Ï¡¼¥É¥³¡¼¥É¤µ¤ì¤Æ¤¤¤ë¥·¥ç¡¼¥È
          ¥«¥Ã¥È¤òºï½ü¤·¡¢¥«¥¹¥¿¥Þ¥¤¥º²Äǽ¤Ë¤·¤¿¡£
+       * src/utils.[ch]: LF ¤ò CR+LF ¤ËÊÑ´¹¤·¤¿¤È¤­¤Î¥Õ¥¡¥¤¥ë¥µ¥¤¥º¤ò
+         ÊÖ¤¹ get_file_size_as_crlf() ¤òÄɲá£
 
 2002-01-22
 

diff --git a/configure.in b/configure.in
index bb3babbbabd6bd8604c250b33b359380aaf57c9b..0a3d4d9c3952a8c51cbcd26fd91d16eda1d09e87 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -8,7 +8,7 @@ MINOR_VERSION=7
 MICRO_VERSION=0
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=claws23
+EXTRA_VERSION=claws24
 VERSION=$MAJOR_VERSION.$MINOR_VERSION.$MICRO_VERSION$EXTRA_VERSION
 
 dnl set $target

diff --git a/src/imap.c b/src/imap.c
index 5e4c0f5f05b428b49659d5722fac1373b25e17d8..fba1032b25c2787121442d329b68e6cbf34db8f5 100644 (file)
--- a/src/imap.c
+++ b/src/imap.c
@@ -2289,7 +2289,7 @@ static gint imap_cmd_append(SockInfo *sock, const gchar *destfolder,
 
        g_return_val_if_fail(file != NULL, IMAP_ERROR);
 
-       size = get_file_size(file);
+       size = get_file_size_as_crlf(file);
        QUOTE_IF_REQUIRED(destfolder_, destfolder);
        imap_cmd_gen_send(sock, "APPEND %s {%d}", destfolder_, size);
        ok = imap_cmd_ok(sock, NULL);

diff --git a/src/utils.c b/src/utils.c
index 173900b690b9a8dd639ecbfa988eb86a42e81b2c..74843a3e5055bad2bacf796e622decea67d9ae49 100644 (file)
--- a/src/utils.c
+++ b/src/utils.c
@@ -1299,6 +1299,53 @@ off_t get_file_size(const gchar *file)
        return s.st_size;
 }
 
+off_t get_file_size_as_crlf(const gchar *file)
+{
+       FILE *fp;
+       off_t size = 0;
+       gint left;
+       gint line_len;
+       gchar buf[BUFSIZ];
+       gchar *p, *prev;
+
+       if ((fp = fopen(file, "r")) == NULL) {
+               FILE_OP_ERROR(file, "fopen");
+               return -1;
+       }
+
+       while ((left = fread(buf, sizeof(gchar), sizeof(buf), fp)) > 0) {
+               prev = buf;
+
+               if (left < sizeof(buf) && ferror(fp))
+                       break;
+
+               do {
+                       p = memchr(prev, '\n', left);
+                       if (p != NULL) {
+                               line_len = p - prev;
+                               if (p > buf && *(p - 1) == '\r')
+                                       size += line_len + 1;
+                               else
+                                       size += line_len + 2;
+                               left -= line_len + 1;
+                               prev = p + 1;
+                       } else {
+                               size += left;
+                               break;
+                       }
+               } while (left > 0);
+       }
+
+       if (ferror(fp)) {
+               FILE_OP_ERROR(file, "fread");
+               size = -1;
+       }
+
+       fclose(fp);
+
+       return size;
+}
+
 off_t get_left_file_size(FILE *fp)
 {
        glong pos;

diff --git a/src/utils.h b/src/utils.h
index e41939d4deb4a6a77506efdb2ec083475f608edc..04802f37620d64b8bede315ca84e074e56737385 100644 (file)
--- a/src/utils.h
+++ b/src/utils.h
@@ -293,6 +293,7 @@ gchar *get_domain_name              (void);
 
 /* file / directory handling */
 off_t get_file_size            (const gchar    *file);
+off_t get_file_size_as_crlf    (const gchar    *file);
 off_t get_left_file_size       (FILE           *fp);
 gboolean file_exist            (const gchar    *file,
                                 gboolean        allow_fifo);