diff options
| author | Andreas Gruenbacher <agruen@linbit.com> | 2011-10-05 02:59:17 +0200 |
|---|---|---|
| committer | Andreas Gruenbacher <agruen@linbit.com> | 2011-10-05 03:42:15 +0200 |
| commit | d2b4b7a2fd61df4ab33cbbaf8efdcfc44f1028bb (patch) | |
| tree | 1b60e3f49617666a10435dccec2a1ba0f3e15ee7 | |
| parent | db813a0171644f7de57df926afb455e8aa1e42c1 (diff) | |
| download | quilt-d2b4b7a2fd61df4ab33cbbaf8efdcfc44f1028bb.tar.gz | |
quilt mail: Support multiline email headers
Some of the email header parsing code did not understand headers which span
more than a line. This mainly broke long subject lines.
| -rw-r--r-- | quilt/mail.in | 36 |
1 files changed, 21 insertions, 15 deletions
diff --git a/quilt/mail.in b/quilt/mail.in index b9b73b1..bbb4718 100644 --- a/quilt/mail.in +++ b/quilt/mail.in @@ -560,20 +560,25 @@ for patch in "${patches[@]}"; do new_date="$(date --rfc-822 -d "1970/01/01 UTC $last_ts seconds")" modify="$(awk ' - sub(/^Recipient-/, "") { r = $0 - sub(/:.*/, "", r) - s = $0 - sub(/^[^:]*:[ \t]*/, "", s) - gsub(/'\''/, "'\'\''", s) - print "--add-recipient " r "='\''" s "'\'' \\" - } - sub(/^Replace-/, "") { r = $0 - sub(/:.*/, "", r) - s = $0 - sub(/^[^:]*:[ \t]*/, "", s) - gsub(/'\''/, "'\'\''", s) - print "--replace-header " r "='\''" s "'\'' \\" - } + in_header { if (/^[ \t]/) { + headers[n] = headers[n] "\n" $0 + next } + in_header = 0 } + sub(/^Recipient-/, "") { headers[++n] = $0 + options[n] = "--add-recipient" + in_header = 1 + next } + sub(/^Replace-/, "") { headers[++n] = $0 + options[n] = "--replace-header" + in_header = 1 + next } + END { for(n = 1; n in headers; n++) { + r = headers[n] + sub(/:.*/, "", r) + s = headers[n] + sub(/^[^:]*:[ \t]*/, "", s) + gsub(/'\''/, "'\'\''", s) + print options[n] " " r "='\''" s "'\'' \\" } } ' $body)" # echo "$modify" | sed -e 's/^/>> /' >&2 p=${subject_prefix//@num@/$(printf %0*d ${#total} $num)} @@ -587,8 +592,9 @@ for patch in "${patches[@]}"; do references_header $introduction echo "Content-Disposition: inline; filename=$patch" awk ' + kill_header { if (/^[ \t]/) next ; kill_header = 0 } !in_body && tolower($0) ~ /^(recipient|replace)-.*:/ \ - { next } + { kill_header = 1 ; next } /^$/ { in_body = 1 } { print } ' $body |