X-Git-Url: http://git.marmaro.de/?p=mmh;a=blobdiff_plain;f=uip%2Fwhatnowproc.c;h=1b16e5d67614298a581c428004b24576a127cfa5;hp=8d6830e4c9aecae73c8b16d0c9261613b95e2f34;hb=0b40f7c1c35770622511eda71ec5353784ea1dc6;hpb=240013872c392fe644bd4f79382d9f5314b4ea60 diff --git a/uip/whatnowproc.c b/uip/whatnowproc.c index 8d6830e..1b16e5d 100644 --- a/uip/whatnowproc.c +++ b/uip/whatnowproc.c @@ -13,18 +13,11 @@ ** This routine is used by comp, repl, forw, and dist to exec ** the "whatnowproc". It first sets up all the environment ** variables that the "whatnowproc" will need to check, and -** then execs the command. As an optimization, if the -** "whatnowproc" is the nmh command "whatnow" (typical case), -** it will call this routine directly without exec'ing it. +** then execs the command. */ - -/* from whatnowsbr.c */ -int WhatNow(int, char **); - - int what_now(char *ed, int nedit, int use, char *file, char *altmsg, int dist, - struct msgs *mp, char *text, int inplace, char *cwd) + struct msgs *mp, char *text, char *cwd) { int found, k, msgnum, vecp; int len, buflen; @@ -66,7 +59,6 @@ what_now(char *ed, int nedit, int use, char *file, char *altmsg, int dist, unputenv("mhmessages"); unputenv("mhannotate"); - unputenv("mhinplace"); if (text && mp && !is_readonly(mp)) { found = 0; @@ -94,8 +86,6 @@ what_now(char *ed, int nedit, int use, char *file, char *altmsg, int dist, if (found) { m_putenv("mhmessages", buffer); m_putenv("mhannotate", text); - snprintf(buffer, sizeof(buffer), "%d", inplace); - m_putenv("mhinplace", buffer); } } @@ -105,15 +95,6 @@ what_now(char *ed, int nedit, int use, char *file, char *altmsg, int dist, if (cwd) chdir(cwd); - /* - ** If the "whatnowproc" is the nmh command "whatnow", - ** we run it internally, rather than exec'ing it. - */ - if (strcmp(vec[0], "whatnow") == 0) { - WhatNow(vecp, vec); - done(0); - } - execvp(whatnowproc, vec); fprintf(stderr, "unable to exec "); perror(whatnowproc);