repl: Changed the meaning of -mime: It's now orthogonal to -format/-filter.
[mmh] / uip / repl.c
index a36b2c7..299185d 100644 (file)
@@ -248,7 +248,6 @@ main(int argc, char **argv)
                                        adios(NULL, "missing argument to %s",
                                                        argp[-2]);
                                filter = getcpy(etcpath(cp));
-                               mime = 0;
                                continue;
                        case FORMSW:
                                if (!(form = *argp++) || *form == '-')
@@ -258,7 +257,6 @@ main(int argc, char **argv)
 
                        case FRMTSW:
                                filter = getcpy(etcpath(mhlreply));
-                               mime = 0;
                                continue;
                        case NFRMTSW:
                                filter = NULL;
@@ -266,7 +264,6 @@ main(int argc, char **argv)
 
                        case MIMESW:
                                mime++;
-                               filter = NULL;
                                continue;
                        case NMIMESW:
                                mime = 0;
@@ -596,8 +593,8 @@ finished:
                adios(drft, "error writing");
        fclose(out);
 
-       /* if we want mime, then add an attachment header */
-       if (!filter && mime && mp) {
+       if (mime && mp) {
+               /* add an attachment header */
                char buffer[BUFSIZ];
 
                snprintf(buffer, sizeof buffer, "+%s %s",