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

diff --git a/uip/whatnowsbr.c b/uip/whatnowsbr.c
index ad7570a..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;
@@ -1107,9 +1097,6 @@ sendit (char *sp, char **arg, char *file, int pushed)
 #ifndef	lint
     int	distsw = 0;
 #endif
-#ifdef UCI
-    FILE *fp;
-#endif
 
     /*
      * Make sure these are defined.  In particular, we need
@@ -1310,18 +1297,6 @@ sendit (char *sp, char **arg, char *file, int pushed)
     if ((cp = getenv ("SIGNATURE")) == NULL || *cp == 0)
 	if ((cp = context_find ("signature")) && *cp)
 	    m_putenv ("SIGNATURE", cp);
-#ifdef UCI
-	else {
-	    snprintf (buf, sizeof(buf), "%s/.signature", mypath);
-	    if ((fp = fopen (buf, "r")) != NULL
-		&& fgets (buf, sizeof(buf), fp) != NULL) {
-		    fclose (fp);
-		    if (cp = strchr (buf, '\n'))
-			*cp = 0;
-		    m_putenv ("SIGNATURE", buf);
-	    }
-	}
-#endif /* UCI */
 
     if ((annotext = getenv ("mhannotate")) == NULL || *annotext == 0)
 	annotext = NULL;
@@ -1338,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 {