]> git.marmaro.de Git - mmh/commitdiff
Call send directly, not via sendproc. Removed its profile entry, too.
authormarkus schnalke <meillo@marmaro.de>
Thu, 22 Mar 2012 12:33:49 +0000 (13:33 +0100)
committermarkus schnalke <meillo@marmaro.de>
Thu, 22 Mar 2012 12:33:49 +0000 (13:33 +0100)
config/config.c
h/mh.h
man/mh-profile.man5
man/whatnow.man1
sbr/readconfig.c
uip/mhparam.c
uip/spost.c
uip/whatnow.c

index bfdc242f722278d0882575e8d202e8a5b9b8aac4..90c14101971cdc075ad5ad1c0f5476afd5abe8e5 100644 (file)
@@ -146,12 +146,6 @@ char *defaulteditor = "vi";
 */
 char *rmmproc = NULL;
 
-/*
-** This program is usually called by the user's whatnowproc, but it
-** may also be called directly to send a message previously composed.
- */
-char *sendproc = NMHBINDIR"/send";
-
 /*
 ** This program is called after comp, et. al., have built a draft
 */
diff --git a/h/mh.h b/h/mh.h
index f18f62b1da27d1aa4be372d0204a9bf3a3a886cd..8f66669dfca5b1017cefe5e3cf9217208131af05 100644 (file)
--- a/h/mh.h
+++ b/h/mh.h
@@ -322,7 +322,6 @@ extern char *replcomps;
 extern char *replgroupcomps;
 extern char *rmmproc;
 extern char *sendmail;
-extern char *sendproc;
 extern char *seq_all;
 extern char *seq_beyond;
 extern char *seq_cur;
index d47b78f37cc90e9df2677a97f3cf0a30013150cc..c6524284bdd6fdb9c339e8008e2ca3381c8e1368 100644 (file)
@@ -435,14 +435,6 @@ and
 to delete a message from a folder.
 .RE
 .PP
-.BR sendproc :
-%bindir%/send
-.RS 5
-This is the program to use by
-.B whatnow
-to actually send the message
-.RE
-.PP
 .BR whatnowproc :
 %bindir%/whatnow
 .RS 5
index 70b921ba1fad82a91febe143e1d8809b3ea029fe..9274246c168abf49f079a93f9393acfbd3a4b948 100644 (file)
@@ -160,7 +160,6 @@ information.
 ^~^from <lasteditor>
 ^fileproc:~^Program to refile the message
 ^listproc:~^Program to list the contents of a message
-^sendproc:~^Program to use to send the message
 .fi
 
 .SH "SEE ALSO"
index 9a05a2b9f078c1215bcb4d71fafcadd3c750bce4..bcff1da22a44ce0364d15c85bf3802e3ab85c209 100644 (file)
@@ -26,7 +26,6 @@ static struct procstr procs[] = {
        { "listproc",      &listproc },
        { "rmmproc",       &rmmproc },
        { "sendmail",      &sendmail },
-       { "sendproc",      &sendproc },
        { "whatnowproc",   &whatnowproc },
        { NULL, NULL }
 };
index d456454457cd02e0bf80987f641a6d5dbec2c982..20a95e7ba8179316813b656871befee3e7f34a83 100644 (file)
@@ -45,7 +45,6 @@ static struct proc procs [] = {
        { "pager",         &defaultpager },
        { "rmmproc",       &rmmproc },
        { "sendmail",      &sendmail },
-       { "sendproc",      &sendproc },
        { "version",       &version_num },
        { "whatnowproc",   &whatnowproc },
        { "etcdir",        &mhetcdir },
index 046f3403a66ed6ad758ff85bf563d61f3cf509e1..43d3d10654aa7dd27e4dae06dd511b419e3ae700 100644 (file)
@@ -692,7 +692,7 @@ process_bccs(char *origmsg)
                fprintf(out, "------------\n");
                fclose(out);
 
-               snprintf(buf, sizeof buf, "%s%s %s", sendproc,
+               snprintf(buf, sizeof buf, "send%s %s",
                                pushflg ? " -push" : "", bccdraft);
                if (system(buf) != 0) {
                        admonish(invo_name, "Problems to send Bcc to %s",
index 3d97716c1646aa5cab803f3108c0d616e0afeb46..168384f7479dba98d19edcc87b79e8fb230302fb 100644 (file)
@@ -790,9 +790,9 @@ sendfile(char **arg, char *file, int pushsw)
                vec[vecp++] = file;
                vec[vecp] = NULL;
 
-               execvp(sendproc, vec);
+               execvp("send", vec);
                fprintf(stderr, "unable to exec ");
-               perror(sendproc);
+               perror("send");
                _exit(-1);
 
        default: