projects
/
mmh
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fixed broken swit numbering (there are more files to fix)
[mmh]
/
uip
/
spost.c
diff --git
a/uip/spost.c
b/uip/spost.c
index
4d23fe5
..
80c6183
100644
(file)
--- 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 */
{ "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 },
{ "push", -4 },
-#define NPUSHSW 23 /* exec sendmail */
+#define NPUSHSW 20 /* exec sendmail */
{ "nopush", -6 },
{ "nopush", -6 },
-#define LIBSW 24
+#define LIBSW 21
{ "library directory", -7 },
{ "library directory", -7 },
-#define ANNOSW 25
+#define ANNOSW 22
{ "idanno number", -6 },
{ NULL, 0 }
};
{ "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 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;
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;
msgstate = resent;
continue;
- case WHOMSW:
- whomflg++;
- continue;
-
case FILTSW:
if (!(filter = *argp++) || *filter == '-')
adios (NULL, "missing argument to %s", argp[-2]);
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);
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:
break;
case FILEEOF:
@@
-406,7
+394,7
@@
main (int argc, char **argv)
}
fclose (in);
}
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);
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 "." */
*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;
if (watch || verbose)
*argp++ = "-v";
*argp = NULL;
@@
-841,10
+827,7
@@
file (char *path)
return;
for (i = 0; i < fccind; i++)
return;
for (i = 0; i < fccind; i++)
- if (whomflg)
- printf ("Fcc: %s\n", fccfold[i]);
- else
- fcc (path, fccfold[i]);
+ fcc (path, fccfold[i]);
}
}