Changeset 411:a60586461eb8 for attach.c

Timestamp:

1998-08-25 15:19:47 (10 years ago)

Author:

Thomas Roessler <roessler@…>

Branch:

mutt-0-94

Message:

[patch-0.94.4i.tlr.nametemplate.1] Fix nametemplate
support: We should not move the user's files around just
to make them match mailcap's idea of their file name.
This patch uses symbolic links instead.

Files:

• attach.c (modified) (20 diffs)

attach.c

@@ -46 +46 @@
   char type[STRING];
   char command[STRING];
+  char newfile[_POSIX_PATH_MAX] = "";
   rfc1524_entry *entry = rfc1524_new_entry ();
-
+  short unlink_newfile = 0;
+  int rc = 0;
+  
   snprintf (type, sizeof (type), "%s/%s", TYPE (a), a->subtype);
   if (rfc1524_mailcap_lookup (a, type, entry, M_COMPOSE))
@@ -53 +56 @@
     if (entry->composecommand || entry->composetypecommand)
     {
-      char newfile[_POSIX_PATH_MAX] = "";
 
       if (entry->composetypecommand)
@@ -64 +66 @@
         dprint(1, (debugfile, "oldfile: %s\t newfile: %s\n",
                                   a->filename, newfile));
-        if (!mutt_rename_file (a->filename, newfile))
+        if (symlink (a->filename, newfile) == -1)
         {
           if (!mutt_yesorno ("Can't match nametemplate, continue?", 1))
-            return 0;
+            goto bailout;
         }
-        else
-        {
-          safe_free ((void **) &a->filename);
-          a->filename = safe_strdup (newfile);
-        }
-      }
-
-      if (rfc1524_expand_command (a, a->filename, type,
+        unlink_newfile = 1;
+      }
+      else
+        strfcpy(newfile, a->filename, sizeof(newfile));
+      
+      if (rfc1524_expand_command (a, newfile, type,
                                       command, sizeof (command)))
       {
@@ -95 +95 @@
           {
             mutt_perror ("Failure to open file to parse headers.");
-            return 0;
+            goto bailout;
           }
 
@@ -126 +126 @@
             {
               mutt_perror ("Failure to open file to strip headers.");
-              return 0;
+              goto bailout;
             }
             mutt_copy_stream (fp, tfp);
@@ -147 +147 @@
   }
 
+  rc = 1;
+  
+  bailout:
+  
+  if(unlink_newfile)
+    unlink(newfile);
+
   rfc1524_free_entry (&entry);
-  return 1;
+  return rc;
 }
 
@@ -164 +171 @@
   char type[STRING];
   char command[STRING];
+  char newfile[_POSIX_PATH_MAX] = "";
   rfc1524_entry *entry = rfc1524_new_entry ();
-
+  short unlink_newfile = 0;
+  int rc = 0;
+  
   snprintf (type, sizeof (type), "%s/%s", TYPE (a), a->subtype);
   if (rfc1524_mailcap_lookup (a, type, entry, M_EDIT))
@@ -171 +181 @@
     if (entry->editcommand)
     {
-      char newfile[_POSIX_PATH_MAX] = "";
 
       strfcpy (command, entry->editcommand, sizeof (command));
@@ -179 +188 @@
         dprint(1, (debugfile, "oldfile: %s\t newfile: %s\n",
                                   a->filename, newfile));
-        if (mutt_rename_file (a->filename, newfile))
+        if (symlink (a->filename, newfile) == -1)
         {
           if (!mutt_yesorno ("Can't match nametemplate, continue?", 1))
-            return 0;
+            goto bailout;
         }
-        else
-        {
-          safe_free ((void **) &a->filename);
-          a->filename = safe_strdup (newfile);
-        }
-      }
-
-      if (rfc1524_expand_command (a, a->filename, type,
+        unlink_newfile = 1;
+      }
+      else
+        strfcpy(newfile, a->filename, sizeof(newfile));
+
+      if (rfc1524_expand_command (a, newfile, type,
                                       command, sizeof (command)))
       {
@@ -208 +215 @@
     /* On text, default to editor */
     mutt_edit_file ((!Editor || strcmp ("builtin", Editor) == 0) ? 
-                    NONULL(Visual) : NONULL(Editor), a->filename);
+                    NONULL(Visual) : NONULL(Editor), newfile);
   }
   else
@@ -217 +224 @@
   }
 
+  rc = 1;
+  
+  bailout:
+  
+  if(unlink_newfile)
+    unlink(newfile);
+  
   rfc1524_free_entry (&entry);
-  return 1;
+  return rc;
 }
 
@@ -254 +268 @@
   rfc1524_entry *entry = NULL;
   int rc = -1;
-
+  int unlink_tempfile = 0;
+  
   is_message = mutt_is_message_type(a->type, a->subtype);
 #ifdef _PGPPATH
@@ -305 +320 @@
       {
         /* send case: the file is already there */
-        if (mutt_rename_file (a->filename, tempfile))
+        if (symlink (a->filename, tempfile) == -1)
         {
           if (mutt_yesorno ("Can't match nametemplate, continue?", 1) == M_YES)
@@ -313 +328 @@
         }
         else
-        {
-          safe_free ((void **) &a->filename);
-          a->filename = safe_strdup (tempfile);
-        }
+          unlink_tempfile = 1;
       }
     }
@@ -469 +481 @@
   if (fp && tempfile[0])
     mutt_unlink (tempfile);
+  else if (unlink_tempfile)
+    unlink(tempfile);
+
   if (pagerfile[0])
     mutt_unlink (pagerfile);
@@ -735 +750 @@
   pid_t thepid;
   FILE *ifp, *fpout;
-
+  short unlink_newfile = 0;
+  
   snprintf (type, sizeof (type), "%s/%s", TYPE (a), a->subtype);
 
@@ -751 +767 @@
       if (!fp)
       {
-        /* only attempt file move in send mode */
-
-        if (mutt_rename_file (a->filename, newfile))
+        if (symlink(a->filename, newfile) == -1)
         {
           if (mutt_yesorno ("Can't match nametemplate, continue?", 1) != M_YES)
@@ -763 +777 @@
         }
         else
-        {
-          safe_free ((void **)&a->filename);
-          a->filename = safe_strdup (newfile);
-        }
+          unlink_newfile = 1;
       }
     }
@@ -804 +815 @@
     if (fp)
       mutt_unlink (newfile);
+    else if (unlink_newfile)
+      unlink(newfile);
 
     rfc1524_free_entry (&entry);
@@ -811 +824 @@
   if (!strcasecmp ("text/plain", a->subtype) ||
       !strcasecmp ("application/postscript", a->subtype))
+  {
     return (mutt_pipe_attachment (fp, a, NONULL(PrintCmd), NULL));
+  }
   else if (mutt_can_decode (a))
   {