< prev index next >

src/java.base/unix/native/libjava/java_props_md.c

Print this page
rev 12440 : 8132374: AIX: fix value of os.version property

*** 501,512 **** setOSNameAndVersion(&sprops); #else struct utsname name; uname(&name); sprops.os_name = strdup(name.sysname); sprops.os_version = strdup(name.release); ! #endif sprops.os_arch = ARCHPROPNAME; if (getenv("GNOME_DESKTOP_SESSION_ID") != NULL) { sprops.desktop = "gnome"; --- 501,525 ---- setOSNameAndVersion(&sprops); #else struct utsname name; uname(&name); sprops.os_name = strdup(name.sysname); + #ifdef _AIX + { + char *os_version = malloc(strlen(name.version) + + strlen(name.release) + 2); + if (os_version != NULL) { + strcpy(os_version, name.version); + strcat(os_version, "."); + strcat(os_version, name.release); + } + sprops.os_version = os_version; + } + #else sprops.os_version = strdup(name.release); ! #endif /* _AIX */ ! #endif /* MACOSX */ sprops.os_arch = ARCHPROPNAME; if (getenv("GNOME_DESKTOP_SESSION_ID") != NULL) { sprops.desktop = "gnome";
< prev index next >