projects
/
mmh
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Removed the -[no]watch flags of send and post.
[mmh]
/
uip
/
spost.c
diff --git
a/uip/spost.c
b/uip/spost.c
index
4384bc4
..
ff1e80a
100644
(file)
--- a/
uip/spost.c
+++ b/
uip/spost.c
@@
-19,28
+19,24
@@
#define MAX_SM_FIELD 1476 /* < largest hdr field sendmail will accept */
#define MAX_SM_FIELD 1476 /* < largest hdr field sendmail will accept */
-struct swit switches[] = {
+static struct swit switches[] = {
#define VERBSW 0
{ "verbose", 0 },
#define NVERBSW 1
{ "noverbose", 2 },
#define VERBSW 0
{ "verbose", 0 },
#define NVERBSW 1
{ "noverbose", 2 },
-#define WATCSW 2
- { "watch", 0 },
-#define NWATCSW 3
- { "nowatch", 2 },
-#define ALIASW 4
+#define ALIASW 2
{ "alias aliasfile", 0 },
{ "alias aliasfile", 0 },
-#define NALIASW 5
+#define NALIASW 3
{ "noalias", 2 },
{ "noalias", 2 },
-#define VERSIONSW 6
+#define VERSIONSW 4
{ "Version", 0 },
{ "Version", 0 },
-#define HELPSW 7
+#define HELPSW 5
{ "help", 0 },
{ "help", 0 },
-#define DEBUGSW 8
+#define DEBUGSW 6
{ "debug", -5 },
{ "debug", -5 },
-#define DISTSW 9
+#define DISTSW 7
{ "dist", -4 }, /* interface from dist */
{ "dist", -4 }, /* interface from dist */
-#define LIBSW 10
+#define LIBSW 8
{ "library directory", -7 },
{ NULL, 0 }
};
{ "library directory", -7 },
{ NULL, 0 }
};
@@
-105,10
+101,9
@@
static struct headers RHeaders[] = {
};
};
-static int badmsg = 0; /* message has bad semantics */
-static int verbose = 0; /* spell it out */
-static int debug = 0; /* debugging post */
-static int watch = 0; /* watch the delivery process */
+static int badmsg = 0;
+static int verbose = 0;
+static int debug = 0;
static int aliasflg = 0; /* if going to process aliases */
static unsigned msgflags = 0; /* what we've seen */
static int aliasflg = 0; /* if going to process aliases */
static unsigned msgflags = 0; /* what we've seen */
@@
-147,9
+142,7
@@
main(int argc, char **argv)
char *sargv[16], buf[BUFSIZ], name[NAMESZ];
FILE *in;
char *sargv[16], buf[BUFSIZ], name[NAMESZ];
FILE *in;
-#ifdef LOCALE
setlocale(LC_ALL, "");
setlocale(LC_ALL, "");
-#endif
invo_name = mhbasename(argv[0]);
/* foil search of user profile/context */
invo_name = mhbasename(argv[0]);
/* foil search of user profile/context */
@@
-193,13
+186,6
@@
main(int argc, char **argv)
verbose = 0;
continue;
verbose = 0;
continue;
- case WATCSW:
- watch++;
- continue;
- case NWATCSW:
- watch = 0;
- continue;
-
case ALIASW:
if (!(cp = *argp++) || *cp == '-')
adios(NULL, "missing argument to %s",
case ALIASW:
if (!(cp = *argp++) || *cp == '-')
adios(NULL, "missing argument to %s",
@@
-300,16
+286,6
@@
main(int argc, char **argv)
fcc(tmpfil, fccs);
}
fcc(tmpfil, fccs);
}
- argp = sargv;
- *argp++ = "send-mail";
- *argp++ = "-m"; /* send to me too */
- *argp++ = "-t"; /* read msg for recipients */
- *argp++ = "-i"; /* don't stop on "." */
- if (watch || verbose) {
- *argp++ = "-v";
- }
- *argp = NULL;
-
if (bccs) {
process_bccs(tmpfil);
if (!(msgflags & MVIS)) {
if (bccs) {
process_bccs(tmpfil);
if (!(msgflags & MVIS)) {
@@
-328,6
+304,15
@@
main(int argc, char **argv)
}
unlink(tmpfil);
}
unlink(tmpfil);
+ argp = sargv;
+ *argp++ = "send-mail";
+ *argp++ = "-m"; /* send to me too */
+ *argp++ = "-t"; /* read msg for recipients */
+ *argp++ = "-i"; /* don't stop on "." */
+ if (verbose) {
+ *argp++ = "-v";
+ }
+ *argp = NULL;
execv(sendmail, sargv);
adios(sendmail, "can't exec");
return -1;
execv(sendmail, sargv);
adios(sendmail, "can't exec");
return -1;