Fix line ends in address rewriting reports.

Reported by Frédéric Marchal.

2 files changed, 16 insertions, 12 deletions

diff --git a/po/de.po b/po/de.po
index bdb4958a..5df3bb2c 100644
--- a/po/de.po
+++ b/po/de.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: fetchmail 6.3.15-pre1\n"
 "Report-Msgid-Bugs-To: fetchmail-devel@lists.berlios.de\n"
-"POT-Creation-Date: 2010-03-19 19:41+0100\n"
+"POT-Creation-Date: 2010-04-01 21:33+0200\n"
 "PO-Revision-Date: 2010-02-24 01:58+0100\n"
 "Last-Translator: Matthias Andree <matthias.andree@gmx.de>\n"
 "Language-Team: Deutsch <de@li.org>\n"
@@ -2515,15 +2515,15 @@ msgstr "Unbekannter Systemfehler"
 msgid "%s (log message incomplete)\n"
 msgstr "%s (Log-Meldung unvollständig)\n"
 
-#: rfc822.c:76
-#, c-format
-msgid "About to rewrite %s"
-msgstr "Dabei, %s umzuschreiben"
+#: rfc822.c:78
+#, fuzzy, c-format
+msgid "About to rewrite %.*s...\n"
+msgstr "Schreibe %.*s um... "
 
-#: rfc822.c:212
-#, c-format
-msgid "Rewritten version is %s\n"
-msgstr "Umgeschriebene Version ist %s\n"
+#: rfc822.c:215
+#, fuzzy, c-format
+msgid "...rewritten version is %.*s.\n"
+msgstr "umgeschriebene Version ist %.*s.\n"
 
 #: rpa.c:118
 msgid "Success"
@@ -2780,7 +2780,7 @@ msgstr "keine Adressen stimmten überein; leite an %s weiter.\n"
 #: sink.c:1229
 #, c-format
 msgid "about to deliver with: %s\n"
-msgstr "dabei, auszuliefern mit: %s\n"
+msgstr "werde mit %s ausliefern\n"
 
 #: sink.c:1240
 #, c-format
diff --git a/rfc822.c b/rfc822.c
index 97f26771..6b1a2b3d 100644
--- a/rfc822.c
+++ b/rfc822.c
@@ -41,6 +41,8 @@ const char *program_name = "rfc822";
 
 #define HEADER_END(p)	((p)[0] == '\n' && ((p)[1] != ' ' && (p)[1] != '\t'))
 
+#define BEFORE_EOL(s)   (strcspn((s), "\r\n"))
+
 char *reply_hack(
 	char *buf		/* header to be hacked */,
 	const char *host	/* server hostname */,
@@ -73,7 +75,8 @@ char *reply_hack(
 
 #ifndef MAIN
     if (outlevel >= O_DEBUG)
-	report_build(stdout, GT_("About to rewrite %s"), buf);
+	report_build(stdout, GT_("About to rewrite %.*s...\n"),
+			BEFORE_EOL(buf), buf);
 
     /* make room to hack the address; buf must be malloced */
     for (cp = buf; *cp; cp++)
@@ -209,7 +212,8 @@ char *reply_hack(
 
 #ifndef MAIN
     if (outlevel >= O_DEBUG)
-	report_complete(stdout, GT_("Rewritten version is %s\n"), buf);
+	report_complete(stdout, GT_("...rewritten version is %.*s.\n"),
+			BEFORE_EOL(buf), buf);
 #endif /* MAIN */
     *length = strlen(buf);
     return(buf);