strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fdo#60701: Properly quote shell parameter expansions

Browse source 
...and revert bogus c1f02657cc "Fixes fdo#60701 by
escaping uri-encode path correctly" again.

Change-Id: Ic8a85f42e3781068c2aef3b6af23e0d992478d82
This commit is contained in:
Stephan Bergmann 2013-03-11 11:00:49 +01:00
parent 3a31375528
commit 5c32ac5104
1 changed files with 18 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

37
shell/source/unix/misc/senddoc.sh
View file

@ -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
;;
*)