comparison src/java.base/share/native/libjava/System.c @ 51151:1ddf9a99e4ad

Added tag jdk-11+28 for changeset 76072a077ee1
author jwilhelm
date Wed, 22 Aug 2018 21:50:12 +0200
parents b43edd41622d
children
comparison
equal deleted inserted replaced
9:47c743762468 10:d3b4dafa262a
242 PUTPROP(props, "file.separator", sprops->file_separator); 242 PUTPROP(props, "file.separator", sprops->file_separator);
243 PUTPROP(props, "path.separator", sprops->path_separator); 243 PUTPROP(props, "path.separator", sprops->path_separator);
244 PUTPROP(props, "line.separator", sprops->line_separator); 244 PUTPROP(props, "line.separator", sprops->line_separator);
245 245
246 /* 246 /*
247 * user.language 247 * file encoding for stdout and stderr
248 * user.script, user.country, user.variant (if user's environment specifies them)
249 * file.encoding
250 */ 248 */
251 PUTPROP(props, "user.language", sprops->language);
252 if (sprops->script) {
253 PUTPROP(props, "user.script", sprops->script);
254 }
255 if (sprops->country) {
256 PUTPROP(props, "user.country", sprops->country);
257 }
258 if (sprops->variant) {
259 PUTPROP(props, "user.variant", sprops->variant);
260 }
261 PUTPROP(props, "file.encoding", sprops->encoding);
262 if (sprops->sun_stdout_encoding != NULL) { 249 if (sprops->sun_stdout_encoding != NULL) {
263 PUTPROP(props, "sun.stdout.encoding", sprops->sun_stdout_encoding); 250 PUTPROP(props, "sun.stdout.encoding", sprops->sun_stdout_encoding);
264 } 251 }
265 if (sprops->sun_stderr_encoding != NULL) { 252 if (sprops->sun_stderr_encoding != NULL) {
266 PUTPROP(props, "sun.stderr.encoding", sprops->sun_stderr_encoding); 253 PUTPROP(props, "sun.stderr.encoding", sprops->sun_stderr_encoding);
312 PUTPROP(props, "socksNonProxyHosts", sprops->exceptionList); 299 PUTPROP(props, "socksNonProxyHosts", sprops->exceptionList);
313 } 300 }
314 #endif 301 #endif
315 302
316 /* !!! DO NOT call PUTPROP_ForPlatformNString before this line !!! 303 /* !!! DO NOT call PUTPROP_ForPlatformNString before this line !!!
317 * !!! I18n properties have not been set up yet !!! 304 * !!! The platform native encoding for strings has not been set up yet !!!
318 */ 305 */
319 InitializeEncoding(env, sprops->sun_jnu_encoding); 306 InitializeEncoding(env, sprops->sun_jnu_encoding);
320 307
321 /* Printing properties */ 308 /* Printing properties */
322 /* Note: java.awt.printerjob is an implementation private property which 309 /* Note: java.awt.printerjob is an implementation private property which
376 * Windows desktops. 363 * Windows desktops.
377 */ 364 */
378 if (sprops->desktop != NULL) { 365 if (sprops->desktop != NULL) {
379 PUTPROP(props, "sun.desktop", sprops->desktop); 366 PUTPROP(props, "sun.desktop", sprops->desktop);
380 } 367 }
381
382 /*
383 * unset "user.language", "user.script", "user.country", and "user.variant"
384 * in order to tell whether the command line option "-DXXXX=YYYY" is
385 * specified or not. They will be reset in fillI18nProps() below.
386 */
387 REMOVEPROP(props, "user.language");
388 REMOVEPROP(props, "user.script");
389 REMOVEPROP(props, "user.country");
390 REMOVEPROP(props, "user.variant");
391 REMOVEPROP(props, "file.encoding");
392 368
393 ret = JVM_InitProperties(env, props); 369 ret = JVM_InitProperties(env, props);
394 370
395 /* reconstruct i18n related properties */ 371 /* reconstruct i18n related properties */
396 fillI18nProps(env, props, "user.language", sprops->display_language, 372 fillI18nProps(env, props, "user.language", sprops->display_language,