-
- /*
- ** 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);
+ /* Extract the Return-Path. */
+ snprintf(rp, rplen, "%.*s\n", (int)(cp - fromline), fromline);
+ /* Advance over the whitespace. */
+ while (*cp == ' ' || *cp == '\t') {
+ cp++;