From 8cc6b9bed04847a5675f5eec39938b4e242b0b2d Mon Sep 17 00:00:00 2001 From: markus schnalke Date: Thu, 22 Mar 2012 13:33:49 +0100 Subject: [PATCH] Call send directly, not via sendproc. Removed its profile entry, too. --- config/config.c | 6 ------ h/mh.h | 1 - man/mh-profile.man5 | 8 -------- man/whatnow.man1 | 1 - sbr/readconfig.c | 1 - uip/mhparam.c | 1 - uip/spost.c | 2 +- uip/whatnow.c | 4 ++-- 8 files changed, 3 insertions(+), 21 deletions(-) diff --git a/config/config.c b/config/config.c index bfdc242..90c1410 100644 --- a/config/config.c +++ b/config/config.c @@ -147,12 +147,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 */ char *whatnowproc = NMHBINDIR"/whatnow"; diff --git a/h/mh.h b/h/mh.h index f18f62b..8f66669 100644 --- 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; diff --git a/man/mh-profile.man5 b/man/mh-profile.man5 index d47b78f..c652428 100644 --- a/man/mh-profile.man5 +++ b/man/mh-profile.man5 @@ -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 diff --git a/man/whatnow.man1 b/man/whatnow.man1 index 70b921b..9274246 100644 --- a/man/whatnow.man1 +++ b/man/whatnow.man1 @@ -160,7 +160,6 @@ information. ^~^from ^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" diff --git a/sbr/readconfig.c b/sbr/readconfig.c index 9a05a2b..bcff1da 100644 --- a/sbr/readconfig.c +++ b/sbr/readconfig.c @@ -26,7 +26,6 @@ static struct procstr procs[] = { { "listproc", &listproc }, { "rmmproc", &rmmproc }, { "sendmail", &sendmail }, - { "sendproc", &sendproc }, { "whatnowproc", &whatnowproc }, { NULL, NULL } }; diff --git a/uip/mhparam.c b/uip/mhparam.c index d456454..20a95e7 100644 --- a/uip/mhparam.c +++ b/uip/mhparam.c @@ -45,7 +45,6 @@ static struct proc procs [] = { { "pager", &defaultpager }, { "rmmproc", &rmmproc }, { "sendmail", &sendmail }, - { "sendproc", &sendproc }, { "version", &version_num }, { "whatnowproc", &whatnowproc }, { "etcdir", &mhetcdir }, diff --git a/uip/spost.c b/uip/spost.c index 046f340..43d3d10 100644 --- a/uip/spost.c +++ b/uip/spost.c @@ -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", diff --git a/uip/whatnow.c b/uip/whatnow.c index 3d97716..168384f 100644 --- a/uip/whatnow.c +++ b/uip/whatnow.c @@ -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: -- 1.7.10.4