[Jython-checkins] SF.net SVN: jython:[5680] trunk/jython/src/shell/jython.bat

[<otm...@us...>]

Revision: 5680
          http://jython.svn.sourceforge.net/jython/?rev=5680&view=rev
Author:   otmarhumbel
Date:     2008-12-03 09:30:15 +0000 (Wed, 03 Dec 2008)

Log Message:
-----------
prevent JYTHON_OPTS from being enriched with arguments
(this could lead to an infinite recursion of subprocesses)

test_subprocess_jy.py now passes
issue #1187 is fixed now

Modified Paths:
--------------
    trunk/jython/src/shell/jython.bat

Modified: trunk/jython/src/shell/jython.bat
===================================================================
--- trunk/jython/src/shell/jython.bat	2008-12-03 04:38:04 UTC (rev 5679)
+++ trunk/jython/src/shell/jython.bat	2008-12-03 09:30:15 UTC (rev 5680)
@@ -24,6 +24,13 @@
    set _JAVA_CMD="%JAVA_HOME:"=%\bin\java"
 )
 
+rem remove surrounding quotes from jython opts, to be able to safely empty-test it
+set _TRIMMED_JYTHON_OPTS=%JYTHON_OPTS%
+for /f "useback tokens=*" %%a in ('%_TRIMMED_JYTHON_OPTS%') do set _TRIMMED_JYTHON_OPTS=%%~a
+if not "%_TRIMMED_JYTHON_OPTS%"=="" (
+   set _JYTHON_OPTS="%_TRIMMED_JYTHON_OPTS%"
+)
+
 rem remove surrounding quotes from jython home, to be able to safely empty-test it
 set _TRIMMED_JYTHON_HOME=%JYTHON_HOME%
 for /f "useback tokens=*" %%a in ('%_TRIMMED_JYTHON_HOME%') do set _TRIMMED_JYTHON_HOME=%%~a
@@ -81,6 +88,7 @@
 set _ARGS=%_ARGS:"=_D%
 
 set _ARGS="%_ARGS%"
+set _JYTHON_ARGS=
 
 :scanArgs
 rem split args by spaces into first and rest
@@ -134,7 +142,7 @@
 if "%_CMP2:"=\\%" == "-J" goto jvmArg
 
 :jythonArg
-set JYTHON_OPTS=%JYTHON_OPTS% %_CMP%
+set _JYTHON_ARGS=%_JYTHON_ARGS% %_CMP%
 goto nextArg
 
 :jvmArg
@@ -153,7 +161,7 @@
 goto scanArgs
 
 :argsDone
-%_JAVA_CMD% %_JAVA_OPTS% %_JAVA_STACK% -Xbootclasspath/a:%_CP% -Dpython.home=%_JYTHON_HOME% -Dpython.executable="%~f0" -classpath "%CLASSPATH%" org.python.util.jython %JYTHON_OPTS% %_ARGS%
+%_JAVA_CMD% %_JAVA_OPTS% %_JAVA_STACK% -Xbootclasspath/a:%_CP% -Dpython.home=%_JYTHON_HOME% -Dpython.executable="%~f0" -classpath "%CLASSPATH%" org.python.util.jython %_JYTHON_OPTS% %_JYTHON_ARGS% %_ARGS%
 set E=%ERRORLEVEL%
 
 :cleanup
@@ -166,8 +174,11 @@
 set _JAVA_OPTS=
 set _JAVA_STACK=
 set _JYTHON_HOME=
+set _JYTHON_OPTS=
+set _JYTHON_ARGS=
 set _TRIMMED_JAVA_HOME=
 set _TRIMMED_JYTHON_HOME=
+set _TRIMMED_JYTHON_OPTS=
 
 :finish
 exit /b %E%


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.