Changeset 1575:8fe87fc0ebc7 for charset.c

Timestamp:

2000-02-29 14:30:09 (9 years ago)

Author:

Thomas Roessler <roessler@…>

Branch:

HEAD

Message:

Add error checking to the recode-attachment code. From "Andrew W.
Nosenko" <awn@…>.

Files:

• charset.c (modified) (5 diffs)

charset.c

@@ -1056 +1056 @@
   int c;
   int rv = -1;
+  int source_file_is_unchanged = 1;
 
   size_t lf, lpu, lpo;
@@ -1094 +1095 @@
         mutt_decoder_pop (dec, tmp, sizeof (tmp), &lpo);
         if (lpo)
-          fwrite (tmp, lpo, 1, tmpfp);
+        {
+          if (fwrite (tmp, lpo, 1, tmpfp) == EOF)
+            goto bail;
+        }
       } 
       while (lpo);
     }
   }
+  if (lf == EOF && !feof(fp))
+  {
+    goto bail;
+  }
 
   mutt_decoder_push (dec, NULL, 0, NULL);
@@ -1104 +1112 @@
   {
     mutt_decoder_pop (dec, tmp, sizeof (tmp), &lpo);
-    if (lpo) fwrite (tmp, lpo, 1, tmpfp);
+    if (lpo)
+    {
+      if (fwrite (tmp, lpo, 1, tmpfp) == EOF)
+        goto bail;
+    }
   }
   while (lpo);
@@ -1112 +1124 @@
   fclose (fp); fp = NULL;
   rewind (tmpfp);
+
+
+  source_file_is_unchanged = 0;
 
   /* don't use safe_fopen here - we're just going
    * to overwrite the old file.
    */
-
   if ((fp = fopen (fname, "w")) == NULL)
     goto bail;
@@ -1129 +1143 @@
 bail:
   if (rv == -1)
-    mutt_error (_("Error while recoding %s. See %s for recovering your data."),
-                fname, tempfile);
+  {
+    if (source_file_is_unchanged)
+    {
+      mutt_error (_("Error while recoding %s. "
+                    "Leave it unchanged."),
+                  fname);
+    }
+    else
+    {
+      mutt_error (_("Error while recoding %s. "
+                    "See %s for recovering your data."),
+                  fname, tempfile);
+    }
+  }
 
   if (fp) fclose (fp);