You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@ant.apache.org by an...@apache.org on 2016/02/22 04:40:46 UTC
[1/4] ant git commit: Bug 58874: Ant fails to run if ANT_HOME
contains a double-quote character.
Repository: ant
Updated Branches:
refs/heads/master 5a6fda589 -> 327a811c0
Bug 58874: Ant fails to run if ANT_HOME contains a double-quote character.
Project: http://git-wip-us.apache.org/repos/asf/ant/repo
Commit: http://git-wip-us.apache.org/repos/asf/ant/commit/14e71c1a
Tree: http://git-wip-us.apache.org/repos/asf/ant/tree/14e71c1a
Diff: http://git-wip-us.apache.org/repos/asf/ant/diff/14e71c1a
Branch: refs/heads/master
Commit: 14e71c1a93be081c764e2fa54f957b907af6861d
Parents: 790987e
Author: Jeffrey Adamson <jw...@us.ibm.com>
Authored: Fri Jan 15 17:00:39 2016 -0500
Committer: Jeffrey Adamson <jw...@us.ibm.com>
Committed: Fri Jan 15 17:04:27 2016 -0500
----------------------------------------------------------------------
src/script/ant | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ant/blob/14e71c1a/src/script/ant
----------------------------------------------------------------------
diff --git a/src/script/ant b/src/script/ant
index b5ed5be..4c1f750 100644
--- a/src/script/ant
+++ b/src/script/ant
@@ -329,7 +329,7 @@ else
ant_sys_opts="-Djikes.class.path=\"$JIKESPATH\""
fi
fi
-ant_exec_command="exec \"$JAVACMD\" $ANT_OPTS -classpath \"$LOCALCLASSPATH\" -Dant.home=\"$ANT_HOME\" -Dant.library.dir=\"$ANT_LIB\" $ant_sys_opts org.apache.tools.ant.launch.Launcher $ANT_ARGS -cp \"$CLASSPATH\""
+ant_exec_command="exec \"\$JAVACMD\" $ANT_OPTS -classpath \"\$LOCALCLASSPATH\" -Dant.home=\"\$ANT_HOME\" -Dant.library.dir=\"\$ANT_LIB\" $ant_sys_opts org.apache.tools.ant.launch.Launcher $ANT_ARGS -cp \"\$CLASSPATH\""
if $ant_exec_debug ; then
echo $ant_exec_command $ant_exec_args
fi
[2/4] ant git commit: Bug 58898: Ant fails to run when arguments
contain double-quote character
Posted by an...@apache.org.
Bug 58898: Ant fails to run when arguments contain double-quote character
Test with lots of args that break existing script
./ant --execdebug -Df='"' -Dx="'" "-Dx='" -Dz=\'\""'"
Project: http://git-wip-us.apache.org/repos/asf/ant/repo
Commit: http://git-wip-us.apache.org/repos/asf/ant/commit/568c3eeb
Tree: http://git-wip-us.apache.org/repos/asf/ant/tree/568c3eeb
Diff: http://git-wip-us.apache.org/repos/asf/ant/diff/568c3eeb
Branch: refs/heads/master
Commit: 568c3eeb96badf1e47380fd3e641cfc9a9ee935e
Parents: 14e71c1
Author: Jeffrey Adamson <jw...@us.ibm.com>
Authored: Wed Jan 20 16:14:48 2016 -0500
Committer: Jeffrey Adamson <jw...@us.ibm.com>
Committed: Wed Jan 20 16:14:48 2016 -0500
----------------------------------------------------------------------
src/script/ant | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ant/blob/568c3eeb/src/script/ant
----------------------------------------------------------------------
diff --git a/src/script/ant b/src/script/ant
index 4c1f750..6baf121 100644
--- a/src/script/ant
+++ b/src/script/ant
@@ -35,7 +35,8 @@ for arg in "$@" ; do
if [ my"$arg" = my"-h" -o my"$arg" = my"-help" ] ; then
show_help=true
fi
- ant_exec_args="$ant_exec_args \"$arg\""
+ # wrap all arguments as "" strings, escape any internal back-slash or double-quote characters
+ ant_exec_args="$ant_exec_args \"$(printf '%s' "$arg" | sed -e 's@"\|\\@\\\0@g' )\""
fi
done
@@ -333,4 +334,5 @@ ant_exec_command="exec \"\$JAVACMD\" $ANT_OPTS -classpath \"\$LOCALCLASSPATH\" -
if $ant_exec_debug ; then
echo $ant_exec_command $ant_exec_args
fi
-eval $ant_exec_command "$ant_exec_args"
+
+eval $ant_exec_command $ant_exec_args
[4/4] ant git commit: closes #14
Posted by an...@apache.org.
closes #14
Project: http://git-wip-us.apache.org/repos/asf/ant/repo
Commit: http://git-wip-us.apache.org/repos/asf/ant/commit/327a811c
Tree: http://git-wip-us.apache.org/repos/asf/ant/tree/327a811c
Diff: http://git-wip-us.apache.org/repos/asf/ant/diff/327a811c
Branch: refs/heads/master
Commit: 327a811c0bd7380f7570a0089df2dc0665a6e5e2
Parents: 31e3c02
Author: Antoine Levy-Lambert <an...@gmx.de>
Authored: Sun Feb 21 22:37:21 2016 -0500
Committer: Antoine Levy-Lambert <an...@gmx.de>
Committed: Sun Feb 21 22:37:21 2016 -0500
----------------------------------------------------------------------
CONTRIBUTORS | 1 +
WHATSNEW | 6 ++++++
contributors.xml | 4 ++++
3 files changed, 11 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ant/blob/327a811c/CONTRIBUTORS
----------------------------------------------------------------------
diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index efcb247..14de97a 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -177,6 +177,7 @@ Jeff Gettle
Jeff Martin
Jeff Tulley
Jeff Turner
+Jeffrey Adamson
Jene Jasper
Jeremy Mawson
Jerome Lacoste
http://git-wip-us.apache.org/repos/asf/ant/blob/327a811c/WHATSNEW
----------------------------------------------------------------------
diff --git a/WHATSNEW b/WHATSNEW
index 3256f14..f7c2b9b 100644
--- a/WHATSNEW
+++ b/WHATSNEW
@@ -50,6 +50,12 @@ Fixed bugs:
substrings of other keys. Keys are now sorted by descending size.
Bugzilla Report 58997
+ * Ant fails to run when arguments contain double-quote character.
+ Bugzilla Report 58898
+
+ * Ant fails to run if ANT_HOME contains a double-quote character.
+ Bugzilla Report 58874
+
Other changes:
--------------
http://git-wip-us.apache.org/repos/asf/ant/blob/327a811c/contributors.xml
----------------------------------------------------------------------
diff --git a/contributors.xml b/contributors.xml
index 25b4e88..137b996 100644
--- a/contributors.xml
+++ b/contributors.xml
@@ -732,6 +732,10 @@
<last>Turner</last>
</name>
<name>
+ <first>Jeffrey</first>
+ <last>Adamson</last>
+ </name>
+ <name>
<first>Jene</first>
<last>Jasper</last>
</name>
[3/4] ant git commit: Merge branch 'master' of
https://github.com/jwadamson/ant-1
Posted by an...@apache.org.
Merge branch 'master' of https://github.com/jwadamson/ant-1
Project: http://git-wip-us.apache.org/repos/asf/ant/repo
Commit: http://git-wip-us.apache.org/repos/asf/ant/commit/31e3c02f
Tree: http://git-wip-us.apache.org/repos/asf/ant/tree/31e3c02f
Diff: http://git-wip-us.apache.org/repos/asf/ant/diff/31e3c02f
Branch: refs/heads/master
Commit: 31e3c02f2efe20ff6f6796f6dd3434a143d63fee
Parents: 5a6fda5 568c3ee
Author: Antoine Levy-Lambert <an...@gmx.de>
Authored: Sun Feb 21 22:28:55 2016 -0500
Committer: Antoine Levy-Lambert <an...@gmx.de>
Committed: Sun Feb 21 22:28:55 2016 -0500
----------------------------------------------------------------------
src/script/ant | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
----------------------------------------------------------------------