Activated Jon's attachment system by default and steamlined it.

[mmh] / uip / send.c

diff --git a/uip/send.c b/uip/send.c
index eb67824..eb140c9 100644 (file)
--- a/uip/send.c
+++ b/uip/send.c
@@ -77,11 +77,7 @@ static struct swit switches[] = {
        { "server host", 6 },
 #define SNOOPSW  31
        { "snoop", 5 },
-#define ATTACHSW  32
-       { "attach", 6 },
-#define ATTACHFORMATSW  33
-       { "attachformat", 7 },
-#define PORTSW  34
+#define PORTSW  32
        { "port server-port-name/number" , 4 },
        { NULL, 0 }
 };
@@ -109,8 +105,6 @@ main(int argc, char **argv)
        char *msgs[MAXARGS], *vec[MAXARGS];
        struct msgs *mp;
        struct stat st;
-       char *attach = NULL;  /* header field name for attachments */
-       int attachformat = 0; /* mhbuild format specifier for attachments */
 #ifdef UCI
        FILE *fp;
 #endif /* UCI */
@@ -219,25 +213,6 @@ main(int argc, char **argv)
                                vec[vecp++] = cp;
                                continue;
 
-                       case ATTACHSW:
-                               if (!(attach = *argp++) || *attach == '-')
-                                       adios(NULL, "missing argument to %s",
-                                                       argp[-2]);
-                               continue;
-
-                       case ATTACHFORMATSW:
-                               if (! *argp || **argp == '-')
-                                       adios(NULL, "missing argument to %s",
-                                                       argp[-1]);
-                               else {
-                                       attachformat = atoi(*argp);
-                                       if (attachformat < 0 || attachformat > ATTACHFORMATS - 1) {
-                                               advise(NULL, "unsupported attachformat %d", attachformat);
-                                               continue;
-                                       }
-                               }
-                               ++argp;
-                               continue;
                        }
                } else {
                        msgs[msgp++] = cp;
@@ -362,8 +337,7 @@ main(int argc, char **argv)
        closefds(3);
 
        for (msgnum = 0; msgnum < msgp; msgnum++) {
-               switch (sendsbr(vec, vecp, msgs[msgnum], &st, 1, attach,
-                               attachformat)) {
+               switch (sendsbr(vec, vecp, msgs[msgnum], &st, 1)) {
                case DONE:
                        done(++status);
                case NOTOK: