diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2013-03-11 11:00:49 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2013-03-11 11:00:49 +0100 |
| commit | 5c32ac5104e9cade52c8a373033644282de9ceff (patch) | |
| tree | 6a2a7efc000eac003199ad3f7c3b9ad9f323cdc2 /shell | |
| parent | 3a31375528ad3d9fc49f5ab3982e96c9e46fa7af (diff) | |
fdo#60701: Properly quote shell parameter expansions
...and revert bogus c1f02657ccece20a1e5843c78115ffcb193eb459 "Fixes fdo#60701 by
escaping uri-encode path correctly" again.
Change-Id: Ic8a85f42e3781068c2aef3b6af23e0d992478d82
Diffstat (limited to 'shell')
| -rw-r--r-- | shell/source/unix/misc/senddoc.sh | 37 |
1 files changed, 18 insertions, 19 deletions
diff --git a/shell/source/unix/misc/senddoc.sh b/shell/source/unix/misc/senddoc.sh index d953741b87f8..2002c3d974f5 100644 --- a/shell/source/unix/misc/senddoc.sh +++ b/shell/source/unix/misc/senddoc.sh @@ -17,8 +17,7 @@ # the License at http://www.apache.org/licenses/LICENSE-2.0 . # -URI_ENCODE="`dirname $0`/uri-encode" -URI_ENCODE=`printf "%b" "$URI_ENCODE"` +URI_ENCODE=`dirname "$0"`/uri-encode FOPTS="" sd_platform=`uname -s` @@ -106,7 +105,7 @@ case `basename "$MAILER" | sed 's/-.*$//'` in shift ;; --attach) - ATTACH=${ATTACH:-}${ATTACH:+,}`echo "file://$2" | ${URI_ENCODE}` + ATTACH=${ATTACH:-}${ATTACH:+,}`echo "file://$2" | "${URI_ENCODE}"` shift ;; *) @@ -240,23 +239,23 @@ case `basename "$MAILER" | sed 's/-.*$//'` in shift ;; --cc) - MAILTO="${MAILTO:-}${MAILTO:+&}cc="`echo "$2" | ${URI_ENCODE}` + MAILTO="${MAILTO:-}${MAILTO:+&}cc="`echo "$2" | "${URI_ENCODE}"` shift ;; --bcc) - MAILTO="${MAILTO:-}${MAILTO:+&}bcc="`echo "$2" | ${URI_ENCODE}` + MAILTO="${MAILTO:-}${MAILTO:+&}bcc="`echo "$2" | "${URI_ENCODE}"` shift ;; --subject) - MAILTO="${MAILTO:-}${MAILTO:+&}subject"=`echo "$2" | ${URI_ENCODE}` + MAILTO="${MAILTO:-}${MAILTO:+&}subject"=`echo "$2" | "${URI_ENCODE}"` shift ;; --body) - MAILTO="${MAILTO:-}${MAILTO:+&}body="`echo "$2" | ${URI_ENCODE}` + MAILTO="${MAILTO:-}${MAILTO:+&}body="`echo "$2" | "${URI_ENCODE}"` shift ;; --attach) - MAILTO="${MAILTO:-}${MAILTO:+&}attach="`echo "file://$2" | ${URI_ENCODE}` + MAILTO="${MAILTO:-}${MAILTO:+&}attach="`echo "file://$2" | "${URI_ENCODE}"` shift ;; *) @@ -282,23 +281,23 @@ case `basename "$MAILER" | sed 's/-.*$//'` in shift ;; --cc) - MAILTO="${MAILTO:-}${MAILTO:+&}cc="`echo "$2" | ${URI_ENCODE}` + MAILTO="${MAILTO:-}${MAILTO:+&}cc="`echo "$2" | "${URI_ENCODE}"` shift ;; --bcc) - MAILTO="${MAILTO:-}${MAILTO:+&}bcc="`echo "$2" | ${URI_ENCODE}` + MAILTO="${MAILTO:-}${MAILTO:+&}bcc="`echo "$2" | "${URI_ENCODE}"` shift ;; --subject) - MAILTO="${MAILTO:-}${MAILTO:+&}subject"=`echo "$2" | ${URI_ENCODE}` + MAILTO="${MAILTO:-}${MAILTO:+&}subject"=`echo "$2" | "${URI_ENCODE}"` shift ;; --body) - MAILTO="${MAILTO:-}${MAILTO:+&}body="`echo "$2" | ${URI_ENCODE}` + MAILTO="${MAILTO:-}${MAILTO:+&}body="`echo "$2" | "${URI_ENCODE}"` shift ;; --attach) - MAILTO="${MAILTO:-}${MAILTO:+&}attachment="`echo "file://$2" | ${URI_ENCODE}` + MAILTO="${MAILTO:-}${MAILTO:+&}attachment="`echo "file://$2" | "${URI_ENCODE}"` shift ;; *) @@ -359,7 +358,7 @@ case `basename "$MAILER" | sed 's/-.*$//'` in case $1 in --attach) #i95688# fix filenames containing accented chars, whatever alien - ATTACH="${ATTACH:-}${ATTACH:+ }"`echo "file://$2" | ${URI_ENCODE}` + ATTACH="${ATTACH:-}${ATTACH:+ }"`echo "file://$2" | "${URI_ENCODE}"` shift ;; *) @@ -401,23 +400,23 @@ case `basename "$MAILER" | sed 's/-.*$//'` in shift ;; --cc) - MAILTO="${MAILTO:-}${MAILTO:+&}cc="`echo "$2" | ${URI_ENCODE}` + MAILTO="${MAILTO:-}${MAILTO:+&}cc="`echo "$2" | "${URI_ENCODE}"` shift ;; --bcc) - MAILTO="${MAILTO:-}${MAILTO:+&}bcc="`echo "$2" | ${URI_ENCODE}` + MAILTO="${MAILTO:-}${MAILTO:+&}bcc="`echo "$2" | "${URI_ENCODE}"` shift ;; --subject) - MAILTO="${MAILTO:-}${MAILTO:+&}subject"=`echo "$2" | ${URI_ENCODE}` + MAILTO="${MAILTO:-}${MAILTO:+&}subject"=`echo "$2" | "${URI_ENCODE}"` shift ;; --body) - MAILTO="${MAILTO:-}${MAILTO:+&}body="`echo "$2" | ${URI_ENCODE}` + MAILTO="${MAILTO:-}${MAILTO:+&}body="`echo "$2" | "${URI_ENCODE}"` shift ;; --attach) - MAILTO="${MAILTO:-}${MAILTO:+&}attachment="`echo "file://$2" | ${URI_ENCODE}` + MAILTO="${MAILTO:-}${MAILTO:+&}attachment="`echo "file://$2" | "${URI_ENCODE}"` shift ;; *) |