< prev index next >

src/java.base/share/native/libjli/args.c

Print this page
rev 17323 : [mq]: 8180334-00.patch

*** 1,7 **** /* ! * Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. Oracle designates this --- 1,7 ---- /* ! * Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. Oracle designates this
*** 76,86 **** // Initialize to 1, as the first argument is the app name and not preprocessed static size_t argsCount = 1; static jboolean stopExpansion = JNI_FALSE; static jboolean relaunch = JNI_FALSE; ! void JLI_InitArgProcessing(jboolean isJava, jboolean disableArgFile) { // No expansion for relaunch if (argsCount != 1) { relaunch = JNI_TRUE; stopExpansion = JNI_TRUE; argsCount = 1; --- 76,86 ---- // Initialize to 1, as the first argument is the app name and not preprocessed static size_t argsCount = 1; static jboolean stopExpansion = JNI_FALSE; static jboolean relaunch = JNI_FALSE; ! void JLI_InitArgProcessing(jboolean hasJavaArgs, jboolean disableArgFile) { // No expansion for relaunch if (argsCount != 1) { relaunch = JNI_TRUE; stopExpansion = JNI_TRUE; argsCount = 1;
*** 89,99 **** } expectingNoDashArg = JNI_FALSE; // for tools, this value remains 0 all the time. ! firstAppArgIndex = isJava ? NOT_FOUND : 0; } int JLI_GetAppArgIndex() { // Will be 0 for tools return firstAppArgIndex; --- 89,99 ---- } expectingNoDashArg = JNI_FALSE; // for tools, this value remains 0 all the time. ! firstAppArgIndex = hasJavaArgs ? 0: NOT_FOUND; } int JLI_GetAppArgIndex() { // Will be 0 for tools return firstAppArgIndex;
< prev index next >