diff options
| -rw-r--r-- | Makefile.in | 2 | ||||
| -rw-r--r-- | NEWS | 6 | ||||
| -rw-r--r-- | fetchmail.c | 2 | ||||
| -rw-r--r-- | rcfile_y.y | 2 | ||||
| -rw-r--r-- | report.c | 5 |
5 files changed, 11 insertions, 6 deletions
diff --git a/Makefile.in b/Makefile.in index 8bfb1e77..d881b808 100644 --- a/Makefile.in +++ b/Makefile.in @@ -4,7 +4,7 @@ # So just uncomment all the lines marked QNX. VERS=3.3 -PL=0 +PL=1 # Ultrix 2.2 make doesn't expand the value of VPATH. srcdir = @srcdir@ @@ -1,6 +1,12 @@ Release Notes: ------------------------------------------------------------------------------ + +pl 3.3.1 (Sun Feb 2 02:17:07 EST 1997): +* Fix incorrect stripcr processing +* Unapply a patch that broke error logging to files. + +------------------------------------------------------------------------------\ fetchmail-3.3 (Sat Feb 1 15:15:13 EST 1997) features -- diff --git a/fetchmail.c b/fetchmail.c index 47fcfe72..39f70074 100644 --- a/fetchmail.c +++ b/fetchmail.c @@ -632,7 +632,7 @@ static int load_params(int argc, char **argv, int optind) /* if stripcr hasn't been set, default it asccording to MDA */ if (ctl->stripcr == -1) - ctl->stripcr = !ctl->mda; + ctl->stripcr = (ctl->mda != (char *)NULL); /* plug in the semi-standard way of indicating a mail address */ if (ctl->server.envelope == (char *)NULL) @@ -355,6 +355,7 @@ static void prc_register(void) FLAG_FORCE(flush); FLAG_FORCE(fetchall); FLAG_FORCE(no_rewrite); + FLAG_FORCE(stripcr); FLAG_FORCE(limit); FLAG_FORCE(fetchlimit); FLAG_FORCE(batchlimit); @@ -396,6 +397,7 @@ void optmerge(struct query *h2, struct query *h1) FLAG_MERGE(flush); FLAG_MERGE(fetchall); FLAG_MERGE(no_rewrite); + FLAG_MERGE(stripcr); FLAG_MERGE(limit); FLAG_MERGE(fetchlimit); FLAG_MERGE(batchlimit); @@ -436,10 +436,7 @@ error_complete (status, errnum, message, va_alist) exit(status); } else - if (partial_message_size_used != 0) - error (status, errnum, "%s", partial_message); - else - error (status, errnum, ""); + error (status, errnum, "%s", partial_message); } } |