#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", 0 },
+ { "noverbose", 2 },
#define WATCSW 2
{ "watch", 0 },
#define NWATCSW 3
- { "nowatch", 0 },
+ { "nowatch", 2 },
#define ALIASW 4
{ "alias aliasfile", 0 },
#define NALIASW 5
- { "noalias", 0 },
+ { "noalias", 2 },
#define VERSIONSW 6
- { "version", 0 },
+ { "Version", 0 },
#define HELPSW 7
{ "help", 0 },
#define DEBUGSW 8
char *sargv[16], buf[BUFSIZ], name[NAMESZ];
FILE *in;
-#ifdef LOCALE
setlocale(LC_ALL, "");
-#endif
invo_name = mhbasename(argv[0]);
/* foil search of user profile/context */
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)) {
}
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 (watch || verbose) {
+ *argp++ = "-v";
+ }
+ *argp = NULL;
execv(sendmail, sargv);
adios(sendmail, "can't exec");
return -1;