X-Git-Url: http://git.marmaro.de/?a=blobdiff_plain;f=uip%2Fwhatnowsbr.c;h=3009e0f0ccf9065381c6374aa321cbb61a84b67f;hb=ca34fbd0a5204d47ad019f64ef03d21ebd3397fd;hp=eaea7e14b123589fff74689bcb2bd4e6ef450752;hpb=c47ebdd0668b01a9227558c31febb0bd3d37f076;p=mmh

diff --git a/uip/whatnowsbr.c b/uip/whatnowsbr.c
index eaea7e1..3009e0f 100644
--- a/uip/whatnowsbr.c
+++ b/uip/whatnowsbr.c
@@ -726,13 +726,6 @@ editfile (char **ed, char **arg, char *file, int use, struct msgs *mp,
 
 	default:
 	    if ((status = pidwait (pid, NOTOK))) {
-#ifdef ATTVIBUG
-		if ((cp = r1bindex (*ed, '/'))
-			&& strcmp (cp, "vi") == 0
-			&& (status & 0x00ff) == 0)
-		    status = 0;
-		else {
-#endif
 		if (((status & 0xff00) != 0xff00)
 		    && (!reedit || (status & 0x00ff))) {
 		    if (!use && (status & 0xff00) &&
@@ -744,9 +737,6 @@ editfile (char **ed, char **arg, char *file, int use, struct msgs *mp,
 		}
 		status = -2;	/* maybe "reedit ? -2 : -1"? */
 		break;
-#ifdef ATTVIBUG
-		}
-#endif
 	    }
 
 	    reedit++;
@@ -821,7 +811,7 @@ copyf (char *ifile, char *ofile)
  */
 
 static int
-sendfile (char **arg, char *file, int pushsw)
+sendfile (char **arg, char *file, volatile int pushsw)
 {
     pid_t child_id;
     int i, vecp;
@@ -1154,6 +1144,16 @@ sendit (char *sp, char **arg, char *file, int pushed)
     vec[vecp++] = "-library";
     vec[vecp++] = getcpy (m_maildir (""));
 
+    if ((cp = context_find ("fileproc"))) {
+      vec[vecp++] = "-fileproc";
+      vec[vecp++] = cp;
+    }
+
+    if ((cp = context_find ("mhlproc"))) {
+      vec[vecp++] = "-mhlproc";
+      vec[vecp++] = cp;
+    }
+
     while ((cp = *argp++)) {
 	if (*cp == '-') {
 	    switch (smatch (++cp, sendswitches)) {
@@ -1313,6 +1313,7 @@ sendit (char *sp, char **arg, char *file, int pushed)
 	    && altmsg) {
 	vec[vecp++] = "-dist";
 	distfile = getcpy (m_mktemp2(altmsg, invo_name, NULL, NULL));
+	unlink(distfile);
 	if (link (altmsg, distfile) == NOTOK)
 	    adios (distfile, "unable to link %s to", altmsg);
     } else {