diff options
| -rw-r--r-- | Makefile.in | 2 | ||||
| -rw-r--r-- | driver.c | 2 | ||||
| -rw-r--r-- | fetchmail.c | 17 |
3 files changed, 13 insertions, 8 deletions
diff --git a/Makefile.in b/Makefile.in index e63f53a4..b9ff7c45 100644 --- a/Makefile.in +++ b/Makefile.in @@ -62,7 +62,7 @@ manext = 1 mandir = @mandir@/man$(manext) # Program to install `make'. -INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ -s # Program to install the man page. INSTALL_DATA = @INSTALL_DATA@ # Generic install program. @@ -606,7 +606,7 @@ struct query *ctl; /* query control record */ */ for (idp = xmit_names; idp; idp = idp->next) nlocals++; - sp = sargv = (char **)alloca(ctl->mda_argcount+nlocals+2); + sp = sargv = (char **)alloca(sizeof(char **) * ctl->mda_argcount+nlocals+2); for (i = 0; i < ctl->mda_argcount; i++) *sp++ = ctl->mda_argv[i]; for (idp = xmit_names; idp; idp = idp->next) diff --git a/fetchmail.c b/fetchmail.c index 2558f0b9..4d55bf91 100644 --- a/fetchmail.c +++ b/fetchmail.c @@ -768,6 +768,17 @@ char *argv[]; int pipefd [2]; int childpid; + if (outlevel == O_VERBOSE) + { + char **cp; + + printf("fetchmail: about to deliver via MDA %s, args:", + visbuf(argv[0])); + for (cp = argv+1; *cp; cp++) + printf(" %s(%p)", visbuf(*cp), *cp); + putchar('\n'); + } + if (pipe(pipefd) < 0) { perror("fetchmail: openmailpipe: pipe"); return(-1); @@ -806,9 +817,6 @@ int fd; int err, status; int childpid; - if (outlevel == O_VERBOSE) - fprintf(stderr, "about to close pipe %d\n", fd); - if ((err = close(fd)) != 0) perror("fetchmail: closemailpipe: close failed"); @@ -826,9 +834,6 @@ int fd; } #endif - if (outlevel == O_VERBOSE) - fprintf(stderr, "closed pipe %d\n", fd); - return(err); } |