[icedtea-web] RFC: PR804

[Dr Andrew John Hughes]

On 18:05 Tue 18 Oct     , Omair Majid wrote:
> Hi,
> 
> The attached patch fixes PR804, which is a bug in the javaws launcher. 
> The launcher was eating up spaces in arguments, which caused problems 
> when javaws was used to run jnlp files which included spaces. The fix 
> uses bash arrays to hold and build the command to execute to ensure that 
> spaces are handled correctly.
> 
> Please note that this switches the interpreter used in javaws from sh to 
> bash.
> 
> I would like to push this to HEAD and backport it to 1.1 as well.
> 
> ChangeLog:
> 2011-10-18  Omair Majid  <omajid at redhat.com>
> 
>    * launcher/javaws.in: Use bash arrays to store and join the various
>    arguments to ensure spaces are handled correctly.
> 
> Any thoughts or concerns?
> 
> Cheers,
> Omair

I don't see a huge problem, but I do wonder if a less disruptive
solution might be to improve the option parser in IcedTea-Web itself:

    private static String getJNLPFile() {

    if (args.length == 0) {
        System.out.println(helpMessage);
            System.exit(0);
        } else if (args.length == 1) {
            return args[args.length - 1];
        } else {
            String lastArg = args[args.length - 1];
	        String secondLastArg = args[args.length - 2];

            if (doubleArgs.indexOf(secondLastArg) == -1) {
                return lastArg;
            } else {
	      System.out.println(helpMessage);
                System.exit(0);
            }
        }
        return null;
    }

(from net.sourceforge.jnlp.runtime.Boot).

Instead of assuming that the filename is contained within the last
argument, you could step back until you find the last option.
The filename is then either the concatenation of all the arguments
after that, or all those after that but one if the option is 
a member of doubleArgs.

Another interesting thing about the parser is that it treats
unrecognised options as jnlp filenames:

$ /usr/lib/icedtea6/bin/javaws -dooldstuff
Unable to use Firefox's proxy settings. Using "DIRECT" as proxy type.
netx: Invalid jnlp file -dooldstuff

BTW, these issues with quoting are why we now use Perl for the javac.in
in IcedTea and probably why Oracle have binary launchers...

> diff -r f1468696eda3 launcher/javaws.in
> --- a/launcher/javaws.in	Mon Oct 17 18:41:42 2011 +0200
> +++ b/launcher/javaws.in	Tue Oct 18 17:54:50 2011 -0400
> @@ -1,4 +1,4 @@
> -#!/bin/sh
> +#!/bin/bash
>  
>  JAVA=@JAVA@
>  LAUNCHER_BOOTCLASSPATH=@LAUNCHER_BOOTCLASSPATH@
> @@ -8,27 +8,57 @@
>  PROGRAM_NAME=javaws
>  CP=@JRE@/lib/rt.jar
>  
> -JAVA_ARGS=
> -ARGS=
> +JAVA_ARGS=( )
> +ARGS=( )
> +COMMAND=()
> +
> +i=0
> +j=0
>  
>  while [ "$#" -gt "0" ]; do
>    case "$1" in
>      -J*)
> -      JAVA_ARGS="${JAVA_ARGS} ${1##-J}"
> +      JAVA_ARGS[$i]="${1##-J}"
> +      i=$((i+1))
>        ;;
>      *)
> -      ARGS="${ARGS} $1"
> +      ARGS[$j]="$1"
> +      j=$((j+1))
>        ;;
>    esac
>    shift
>  done
>  
> -${JAVA} ${LAUNCHER_BOOTCLASSPATH} ${LAUNCHER_FLAGS} \
> -  ${JAVA_ARGS} \
> -  -classpath ${CP} \
> -  -Dicedtea-web.bin.name=${PROGRAM_NAME} \
> -  -Dicedtea-web.bin.location=${BINARY_LOCATION} \
> -  ${CLASSNAME} \
> -  ${ARGS}
> +k=0
> +COMMAND[k]="${JAVA}"
> +k=$((k+1))
> +COMMAND[k]="${LAUNCHER_BOOTCLASSPATH}"
> +k=$((k+1))
> +COMMAND[k]="${LAUNCHER_FLAGS}"
> +k=$((k+1))
> +i=0
> +while [ "$i" -lt "${#JAVA_ARGS[@]}" ]; do
> +  COMMAND[k]="${JAVA_ARGS[$i]}"
> +  i=$((i+1))
> +  k=$((k+1))
> +done
> +COMMAND[k]="-classpath"
> +k=$((k+1))
> +COMMAND[k]="${CP}"
> +k=$((k+1))
> +COMMAND[k]="-Dicedtea-web.bin.name=${PROGRAM_NAME}"
> +k=$((k+1))
> +COMMAND[k]="-Dicedtea-web.bin.location=${BINARY_LOCATION}"
> +k=$((k+1))
> +COMMAND[k]="${CLASSNAME}"
> +k=$((k+1))
> +j=0
> +while [ "$j" -lt "${#ARGS[@]}" ]; do
> +  COMMAND[k]="${ARGS[$j]}"
> +  j=$((j+1))
> +  k=$((k+1))
> +done
> +
> +"${COMMAND[@]}"
>  
>  exit $?


-- 
Andrew :)

Free Java Software Engineer
Red Hat, Inc. (http://www.redhat.com)

Support Free Java!
Contribute to GNU Classpath and IcedTea
http://www.gnu.org/software/classpath
http://icedtea.classpath.org
PGP Key: 248BDC07 (https://keys.indymedia.org/)
Fingerprint = EC5A 1F5E C0AD 1D15 8F1F  8F91 3B96 A578 248B DC07
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 836 bytes
Desc: Digital signature
Url : http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20111019/c285237f/attachment.bin