2006-12-26 [wwp] 2.6.1cvs70

[claws.git] / src / partial_download.c

diff --git a/src/partial_download.c b/src/partial_download.c
index e91abea6ef966c73b99af74c5f3e4335561de60e..7377046dff76fe1a3d3494e64091b1798fed9b95 100644 (file)
--- a/src/partial_download.c
+++ b/src/partial_download.c
@@ -141,8 +141,6 @@ static int partial_uidl_mark_mail(MsgInfo *msginfo, int download)
        gchar uidl[POPBUFSIZE];
        time_t recv_time;
        time_t now;
-       int len;
-       int start = TRUE;
        gchar partial_recv[POPBUFSIZE];
        int err = -1;
        gchar *filename;
@@ -257,20 +255,19 @@ static int partial_uidl_mark_mail(MsgInfo *msginfo, int download)
                goto bail;
        }
        
-       while ((len = fread(buf, sizeof(gchar), sizeof(buf)-1, fp)) > 0) {
-               buf[len]='\0';
-               if (start) {
-                       start = FALSE;
-                       fprintf(fpnew, "SC-Marked-For-Download: %d\n", 
-                                       download);
-                       
-                       if(strlen(buf) > strlen("SC-Marked-For-Download: x\n")
-                       && !strncmp(buf, "SC-Marked-For-Download:", 
-                                   strlen("SC-Marked-For-Download:"))) {
-                               fprintf(fpnew, "%s", 
-                                buf+strlen("SC-Marked-For-Download: x\n"));
-                               continue;
-                       }
+       fprintf(fpnew, "SC-Marked-For-Download: %d\n", 
+                       download);
+       while (fgets(buf, sizeof(buf)-1, fp) != NULL) {
+               if(strlen(buf) > strlen("SC-Marked-For-Download: x\n")
+               && !strncmp(buf, "SC-Marked-For-Download:", 
+                           strlen("SC-Marked-For-Download:"))) {
+                       fprintf(fpnew, "%s", 
+                        buf+strlen("SC-Marked-For-Download: x\n"));
+                       continue;
+               } else if (strlen(buf) == strlen("SC-Marked-For-Download: x\n")
+               && !strncmp(buf, "SC-Marked-For-Download:", 
+                           strlen("SC-Marked-For-Download:"))) {
+                       continue;
                }
                fprintf(fpnew, "%s", buf);
        }