stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

8136570: Stop changing user environment variables related to /usr/dt

Browse Source 
4953367: MAWT: Java should be more careful manipulating NLSPATH, XFILESEARCHPATH env variables

Stop changing user environment variables: NLSPATH XFILESEARCHPATH

Reviewed-by: prr
This commit is contained in:
Martin Buchholz 2015-09-16 10:49:11 -07:00
parent 681e6b478b
commit 623caa1da9
1 changed files with 0 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
jdk/src/java.base/unix/native/libjava/java_props_md.c
View File

@ -91,46 +91,6 @@ mapLookup(char* map[], const char* key, char** value) {
return 0;
}
/* This function sets an environment variable using envstring.
* The format of envstring is "name=value".
* If the name has already existed, it will append value to the name.
*/
static void
setPathEnvironment(char *envstring)
{
char name[20], *value, *current;
value = strchr(envstring, '='); /* locate name and value separator */
if (! value)
return; /* not a valid environment setting */
/* copy first part as environment name */
strncpy(name, envstring, value - envstring);
name[value-envstring] = '\0';
value++; /* set value point to value of the envstring */
current = getenv(name);
if (current) {
if (! strstr(current, value)) {
/* value is not found in current environment, append it */
char *temp = malloc(strlen(envstring) + strlen(current) + 2);
strcpy(temp, name);
strcat(temp, "=");
strcat(temp, current);
strcat(temp, ":");
strcat(temp, value);
putenv(temp);
}
/* else the value has already been set, do nothing */
}
else {
/* environment variable is not found */
putenv(envstring);
}
}
#ifndef P_tmpdir
#define P_tmpdir "/var/tmp"
#endif
@ -628,16 +588,6 @@ GetJavaProperties(JNIEnv *env)
sprops.path_separator = ":";
sprops.line_separator = "\n";
#if !defined(_ALLBSD_SOURCE)
/* Append CDE message and resource search path to NLSPATH and
* XFILESEARCHPATH, in order to pick localized message for
* FileSelectionDialog window (Bug 4173641).
*/
setPathEnvironment("NLSPATH=/usr/dt/lib/nls/msg/%L/%N.cat");
setPathEnvironment("XFILESEARCHPATH=/usr/dt/app-defaults/%L/Dt");
#endif
#ifdef MACOSX
setProxyProperties(&sprops);
#endif