Author: jsc
Date: Mon Jun 23 07:58:18 2014
New Revision: 1604712
URL: http://svn.apache.org/r1604712
Log:
#i107072# merge fix from trunk, quote uri-encode
Modified:
openoffice/branches/AOO410/main/shell/source/unix/misc/senddoc.sh
Modified: openoffice/branches/AOO410/main/shell/source/unix/misc/senddoc.sh
URL:
http://svn.apache.org/viewvc/openoffice/branches/AOO410/main/shell/source/unix/misc/senddoc.sh?rev=1604712&r1=1604711&r2=1604712&view=diff
==============================================================================
--- openoffice/branches/AOO410/main/shell/source/unix/misc/senddoc.sh (original)
+++ openoffice/branches/AOO410/main/shell/source/unix/misc/senddoc.sh Mon Jun
23 07:58:18 2014
@@ -19,7 +19,7 @@
# under the License.
#
# *************************************************************
-URI_ENCODE="`dirname $0`/uri-encode"
+URI_ENCODE="`dirname "$0"`/uri-encode"
FOPTS=""
# linux file utility needs -L option to resolve symlinks
@@ -100,7 +100,7 @@ case `basename "$MAILER" | sed 's/-.*$//
shift
;;
--attach)
- ATTACH=${ATTACH:-}${ATTACH:+,}`echo
"file://$2" | ${URI_ENCODE}`
+ ATTACH=${ATTACH:-}${ATTACH:+,}`echo
"file://$2" | "${URI_ENCODE}"`
shift
;;
*)
@@ -160,7 +160,7 @@ case `basename "$MAILER" | sed 's/-.*$//
shift
;;
--attach)
- ATTACH="${ATTACH:-}${ATTACH:+ }--attach "`echo "file://$2"
| ${URI_ENCODE}`
+ ATTACH="${ATTACH:-}${ATTACH:+ }--attach "`echo "file://$2"
| "${URI_ENCODE}"`
shift
;;
*)
@@ -243,23 +243,23 @@ case `basename "$MAILER" | sed 's/-.*$//
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
;;
*)
@@ -285,23 +285,23 @@ case `basename "$MAILER" | sed 's/-.*$//
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
;;
*)
@@ -362,7 +362,7 @@ case `basename "$MAILER" | sed 's/-.*$//
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
;;
*)
@@ -388,23 +388,23 @@ case `basename "$MAILER" | sed 's/-.*$//
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 "$2" | ${URI_ENCODE}`
+
MAILTO="${MAILTO:-}${MAILTO:+&}attachment="`echo "$2" | "${URI_ENCODE}"`
shift
;;
*)
