X-Git-Url: http://git.marmaro.de/?p=mmh;a=blobdiff_plain;f=sbr%2Fm_getfld.c;h=47c7e7deda11b754743777460f19674d9f09a5e9;hp=534f896c2d48138787138a741502a9acbab97ade;hb=83e04675b53374a1436029a367283d6d4ee05a07;hpb=205e60873e26bb542945dc2c48d7385af84ba120

diff --git a/sbr/m_getfld.c b/sbr/m_getfld.c
index 534f896..47c7e7d 100644
--- a/sbr/m_getfld.c
+++ b/sbr/m_getfld.c
@@ -720,45 +720,20 @@ m_Eom(int c, FILE *iob)
 ** Return the Return-Path and Delivery-Date
 ** header information.
 **
-** Currently, I'm assuming that the "From " line
-** takes one of the following forms.
-**
-** From sender date remote from host   (for UUCP delivery)
-** From sender@host  date              (for sendmail delivery)
+** Currently, I'm assuming that the "From " line takes the following form:
+**         "From" sender@host  date        (sendmail delivery)
 */
-
 int
 get_returnpath(char *rp, int rplen, char *dd, int ddlen)
 {
-	char *ap, *bp, *cp, *dp;
+	char *ap, *bp;
 
 	ap = unixbuf;
-	if (!(bp = cp = strchr(ap, ' ')))
+	if (!(bp = strchr(ap, ' ')))
 		return 0;
 
-	/*
-	** Check for "remote from" in envelope to see
-	** if this message uses UUCP style addressing
-	*/
-	while ((cp = strchr(++cp, 'r'))) {
-		if (strncmp(cp, "remote from", 11) == 0) {
-			cp = strrchr(cp, ' ');
-			break;
-		}
-	}
-
-	/*
-	** Get the Return-Path information from
-	** the "From " envelope.
-	*/
-	if (cp) {
-		/* return path for UUCP style addressing */
-		dp = strchr(++cp, '\n');
-		snprintf(rp, rplen, "%.*s!%.*s\n", (int)(dp - cp), cp, (int)(bp - ap), ap);
-	} else {
-		/* return path for standard domain addressing */
-		snprintf(rp, rplen, "%.*s\n", (int)(bp - ap), ap);
-	}
+	/* Get the Return-Path information from the "From " envelope. */
+	snprintf(rp, rplen, "%.*s\n", (int)(bp - ap), ap);
 
 	/*
 	** advance over the spaces to get to
@@ -770,7 +745,7 @@ get_returnpath(char *rp, int rplen, char *dd, int ddlen)
 	/* Now get delivery date from envelope */
 	snprintf(dd, ddlen, "%.*s\n", 24, bp);
 
-	unixbuf[0] = 0;
+	*unixbuf = '\0';
 	return 1;
 }