X-Git-Url: http://git.marmaro.de/?a=blobdiff_plain;f=uip%2Fspost.c;h=80c6183cff955f5c1fc1a899a35117b05676a141;hb=dc6c45394a06750eab463a2523406eed6c77e2e1;hp=4d23fe5f5fc5348e47941b842da798966a73e83f;hpb=a485ed478abbd599d8c9aab48934e7a26733ecb1;p=mmh diff --git a/uip/spost.c b/uip/spost.c index 4d23fe5..80c6183 100644 --- a/uip/spost.c +++ b/uip/spost.c @@ -60,19 +60,13 @@ struct swit switches[] = { { "debug", -5 }, #define DISTSW 18 { "dist", -4 }, /* interface from dist */ -#define CHKSW 19 - { "check", -5 }, /* interface from whom */ -#define NCHKSW 20 - { "nocheck", -7 }, /* interface from whom */ -#define WHOMSW 21 - { "whom", -4 }, /* interface from whom */ -#define PUSHSW 22 /* fork to sendmail then exit */ +#define PUSHSW 19 /* fork to sendmail then exit */ { "push", -4 }, -#define NPUSHSW 23 /* exec sendmail */ +#define NPUSHSW 20 /* exec sendmail */ { "nopush", -6 }, -#define LIBSW 24 +#define LIBSW 21 { "library directory", -7 }, -#define ANNOSW 25 +#define ANNOSW 22 { "idanno number", -6 }, { NULL, 0 } }; @@ -147,7 +141,6 @@ static int debug = 0; /* debugging post */ static int rmflg = 1; /* remove temporary file when done */ static int watch = 0; /* watch the delivery process */ static int backflg = 0; /* rename input file as *.bak when done */ -static int whomflg = 0; /* if just checking addresses */ static int pushflg = 0; /* if going to fork to sendmail */ static int aliasflg = -1; /* if going to process aliases */ static int outputlinelen=72; @@ -244,10 +237,6 @@ main (int argc, char **argv) msgstate = resent; continue; - case WHOMSW: - whomflg++; - continue; - case FILTSW: if (!(filter = *argp++) || *filter == '-') adios (NULL, "missing argument to %s", argp[-2]); @@ -383,11 +372,10 @@ main (int argc, char **argv) case BODY: finish_headers (out); fprintf (out, "\n%s", buf); - if(whomflg == 0) - while (state == BODY) { - state = m_getfld (state, name, buf, sizeof(buf), in); - fputs (buf, out); - } + while (state == BODY) { + state = m_getfld (state, name, buf, sizeof(buf), in); + fputs (buf, out); + } break; case FILEEOF: @@ -406,7 +394,7 @@ main (int argc, char **argv) } fclose (in); - if (backflg && !whomflg) { + if (backflg) { strncpy (buf, m_backup (msg), sizeof(buf)); if (rename (msg, buf) == NOTOK) advise (buf, "unable to rename %s to", msg); @@ -434,8 +422,6 @@ main (int argc, char **argv) *argp++ = "-m"; /* send to me too */ *argp++ = "-t"; /* read msg for recipients */ *argp++ = "-i"; /* don't stop on "." */ - if (whomflg) - *argp++ = "-bv"; if (watch || verbose) *argp++ = "-v"; *argp = NULL; @@ -841,10 +827,7 @@ file (char *path) return; for (i = 0; i < fccind; i++) - if (whomflg) - printf ("Fcc: %s\n", fccfold[i]); - else - fcc (path, fccfold[i]); + fcc (path, fccfold[i]); }