Removed the -fcc switch from repl(1).

[mmh] / uip / replsbr.c

diff --git a/uip/replsbr.c b/uip/replsbr.c
index 2affe31..852becd 100644 (file)
--- a/uip/replsbr.c
+++ b/uip/replsbr.c
@@ -66,8 +66,8 @@ static void replfilter(FILE *, FILE *, char *);
 
 
 void
-replout(FILE *inb, char *msg, char *drft, struct msgs *mp, int outputlinelen,
-       int mime, char *form, char *filter, char *fcc)
+replout(FILE *inb, char *msg, char *drft, struct msgs *mp,
+       int mime, char *form, char *filter)
 {
        register int state, i;
        register struct comp *cptr;
@@ -127,12 +127,6 @@ replout(FILE *inb, char *msg, char *drft, struct msgs *mp, int outputlinelen,
                if (cptr)
                        cptr->c_name = "";
        }
-       /* set up the "fcc" pseudo-component */
-       if (fcc) {
-               FINDCOMP(cptr, "fcc");
-               if (cptr)
-                       cptr->c_text = getcpy(fcc);
-       }
        if ((cp = getenv("USER"))) {
                FINDCOMP(cptr, "user");
                if (cptr)
@@ -236,7 +230,7 @@ finished:
        dat[0] = 0;
        dat[1] = 0;
        dat[2] = 0;
-       dat[3] = outputlinelen;
+       dat[3] = OUTPUTLINELEN;
        dat[4] = 0;
        fmt_scan(fmt, scanl, i, dat);
        fputs(scanl, out);
@@ -245,19 +239,13 @@ finished:
                fputs( badaddrs, out);
        }
 
-       /*
-       ** Check if we should filter the message
-       ** or add mhbuild directives
-       */
+       /* Check if we should filter the message */
        if (filter) {
                fflush(out);
                if (ferror(out))
                        adios(drft, "error writing");
 
                replfilter(inb, out, filter);
-       } else if (mime && mp) {
-               fprintf(out, "#forw [original message] +%s %s\n",
-                               mp->foldpath, m_name(mp->lowsel));
        }
 
        fflush(out);
@@ -265,6 +253,15 @@ finished:
                adios(drft, "error writing");
        fclose(out);
 
+       /* if we want mime, then add an attachment header */
+       if (!filter && mime && mp) {
+               char buffer[BUFSIZ];
+
+               snprintf(buffer, sizeof buffer, "+%s %s",
+                               mp->foldpath, m_name(mp->lowsel));
+               annotate(drft, attach_hdr, buffer, 0, -2, 1);
+       }
+
        /* return dynamically allocated buffers */
        free(scanl);
        for (nxtbuf = compbuffers, i = ncomps; (cptr = *savecomp++);