svn commit: r764479 - in /commons/sandbox/runtime/trunk/src/main/native/os: darwin/os.c hpux/os.c linux/os.c solaris/os.c win32/os.c

[mturk]

Author: mturk
Date: Mon Apr 13 14:11:25 2009
New Revision: 764479

URL: http://svn.apache.org/viewvc?rev=764479&view=rev
Log:
Return OS.getSysname as unified string

Modified:
    commons/sandbox/runtime/trunk/src/main/native/os/darwin/os.c
    commons/sandbox/runtime/trunk/src/main/native/os/hpux/os.c
    commons/sandbox/runtime/trunk/src/main/native/os/linux/os.c
    commons/sandbox/runtime/trunk/src/main/native/os/solaris/os.c
    commons/sandbox/runtime/trunk/src/main/native/os/win32/os.c

Modified: commons/sandbox/runtime/trunk/src/main/native/os/darwin/os.c
URL: 
http://svn.apache.org/viewvc/commons/sandbox/runtime/trunk/src/main/native/os/darwin/os.c?rev=764479&r1=764478&r2=764479&view=diff
==============================================================================
--- commons/sandbox/runtime/trunk/src/main/native/os/darwin/os.c (original)
+++ commons/sandbox/runtime/trunk/src/main/native/os/darwin/os.c Mon Apr 13 
14:11:25 2009
@@ -62,11 +62,8 @@
 
 ACR_JNI_EXPORT_DECLARE(jstring, OS, getRelease)(ACR_JNISTDARGS)
 {
-    struct utsname sys;
-    if (!uname(&sys))
-        return CSTR_TO_JSTRING(sys.release);
-    else
-        return NULL;
+    UNREFERENCED_STDARGS;
+    return CSTR_TO_JSTRING("darwin");
 }
 
 ACR_JNI_EXPORT_DECLARE(jstring, OS, getMachine)(ACR_JNISTDARGS)

Modified: commons/sandbox/runtime/trunk/src/main/native/os/hpux/os.c
URL: 
http://svn.apache.org/viewvc/commons/sandbox/runtime/trunk/src/main/native/os/hpux/os.c?rev=764479&r1=764478&r2=764479&view=diff
==============================================================================
--- commons/sandbox/runtime/trunk/src/main/native/os/hpux/os.c (original)
+++ commons/sandbox/runtime/trunk/src/main/native/os/hpux/os.c Mon Apr 13 
14:11:25 2009
@@ -41,11 +41,8 @@
 
 ACR_JNI_EXPORT_DECLARE(jstring, OS, getSysname)(ACR_JNISTDARGS)
 {
-    struct utsname sys;
-    if (!uname(&sys))
-        return CSTR_TO_JSTRING(sys.sysname);
-    else
-        return CSTR_TO_JSTRING(unknown);
+    UNREFERENCED_STDARGS;
+    return CSTR_TO_JSTRING("hpux");
 }
 
 ACR_JNI_EXPORT_DECLARE(jstring, OS, getVersion)(ACR_JNISTDARGS)

Modified: commons/sandbox/runtime/trunk/src/main/native/os/linux/os.c
URL: 
http://svn.apache.org/viewvc/commons/sandbox/runtime/trunk/src/main/native/os/linux/os.c?rev=764479&r1=764478&r2=764479&view=diff
==============================================================================
--- commons/sandbox/runtime/trunk/src/main/native/os/linux/os.c (original)
+++ commons/sandbox/runtime/trunk/src/main/native/os/linux/os.c Mon Apr 13 
14:11:25 2009
@@ -42,11 +42,8 @@
 
 ACR_JNI_EXPORT_DECLARE(jstring, OS, getSysname)(ACR_JNISTDARGS)
 {
-    struct utsname sys;
-    if (!uname(&sys))
-        return CSTR_TO_JSTRING(sys.sysname);
-    else
-        return CSTR_TO_JSTRING(unknown);
+    UNREFERENCED_STDARGS;
+    return CSTR_TO_JSTRING("linux");
 }
 
 ACR_JNI_EXPORT_DECLARE(jstring, OS, getVersion)(ACR_JNISTDARGS)

Modified: commons/sandbox/runtime/trunk/src/main/native/os/solaris/os.c
URL: 
http://svn.apache.org/viewvc/commons/sandbox/runtime/trunk/src/main/native/os/solaris/os.c?rev=764479&r1=764478&r2=764479&view=diff
==============================================================================
--- commons/sandbox/runtime/trunk/src/main/native/os/solaris/os.c (original)
+++ commons/sandbox/runtime/trunk/src/main/native/os/solaris/os.c Mon Apr 13 
14:11:25 2009
@@ -72,11 +72,8 @@
 
 ACR_JNI_EXPORT_DECLARE(jstring, OS, getNodename)(ACR_JNISTDARGS)
 {
-    char string[MAXSIZESYSSTRING];
-    if (sysinfo(SI_HOSTNAME, string, sizeof(string)) < 0)
-        return CSTR_TO_JSTRING(unknown);
-     else
-        return CSTR_TO_JSTRING(string);
+    UNREFERENCED_STDARGS;
+    return CSTR_TO_JSTRING("solaris");
 }
 
 ACR_JNI_EXPORT_DECLARE(jstring, OS, getProcessor)(ACR_JNISTDARGS)

Modified: commons/sandbox/runtime/trunk/src/main/native/os/win32/os.c
URL: 
http://svn.apache.org/viewvc/commons/sandbox/runtime/trunk/src/main/native/os/win32/os.c?rev=764479&r1=764478&r2=764479&view=diff
==============================================================================
--- commons/sandbox/runtime/trunk/src/main/native/os/win32/os.c (original)
+++ commons/sandbox/runtime/trunk/src/main/native/os/win32/os.c Mon Apr 13 
14:11:25 2009
@@ -53,7 +53,7 @@
 
 ACR_JNI_EXPORT_DECLARE(jstring, OS, getSysname)(ACR_JNISTDARGS)
 {
-    return CSTR_TO_JSTRING("Windows");
+    return CSTR_TO_JSTRING("windows");
 }
 
 ACR_JNI_EXPORT_DECLARE(jstring, OS, getVersion)(ACR_JNISTDARGS)