From 65179f921d37756ed89e1ef7965e13bd5f319650 Mon Sep 17 00:00:00 2001
From: "Eric S. Raymond" <esr@thyrsus.com>
Date: Thu, 30 Jan 1997 17:29:36 +0000
Subject: Add stripcr option.

svn path=/trunk/; revision=842
---
 fetchmail.c | 7 +++++++
 1 file changed, 7 insertions(+)

(limited to 'fetchmail.c')

diff --git a/fetchmail.c b/fetchmail.c
index 75d9e542..47fcfe72 100644
--- a/fetchmail.c
+++ b/fetchmail.c
@@ -630,6 +630,10 @@ static int load_params(int argc, char **argv, int optind)
 	    ctl->server.lead_server = &(ctl->server);
 	no_new_server:;
 
+	    /* if stripcr hasn't been set, default it asccording to MDA */
+	    if (ctl->stripcr == -1)
+		ctl->stripcr = !ctl->mda;
+
 	    /* plug in the semi-standard way of indicating a mail address */
 	    if (ctl->server.envelope == (char *)NULL)
 		ctl->server.envelope = "X-Envelope-To:";
@@ -826,6 +830,9 @@ void dump_params (struct query *ctl)
     printf("  Rewrite of server-local addresses is %sabled (--norewrite %s).\n",
 	   ctl->no_rewrite ? "dis" : "en",
 	   ctl->no_rewrite ? "on" : "off");
+    printf("  Carriage-return stripping is %sabled (--stripcr %s).\n",
+	   ctl->stripcr ? "en" : "dis",
+	   ctl->stripcr ? "on" : "off");
     if (ctl->limit)
 	printf("  Message size limit is %d bytes (--limit %d).\n", 
 	       ctl->limit, ctl->limit);
-- 
cgit v1.2.3