Changeset 3426 for pjproject/trunk/pjlib/src/pj/os_info.c

Timestamp:

Feb 28, 2011 10:19:23 PM (14 years ago)

Author:

bennylp

Message:

Re #1202 (pjlib sysinfo): testing on OpenSolaris? and added pjlib-test entry

File:

• pjproject/trunk/pjlib/src/pj/os_info.c (modified) (3 diffs)

pjproject/trunk/pjlib/src/pj/os_info.c

@@ -89 +89 @@
         return &si;
 
+    si.machine.ptr = si.os_name.ptr = si.sdk_name.ptr = si.info.ptr = "";
+
 #define ALLOC_CP_STR(str,field) \
         do { \
@@ -109 +111 @@
         int i, maxtok;
 
-        if (uname(&u) != 0)
+        /* Successful uname() returns zero on Linux and positive value
+         * on OpenSolaris.
+         */
+        if (uname(&u) == -1)
             goto get_sdk_info;
+
         ALLOC_CP_STR(u.machine, machine);
         ALLOC_CP_STR(u.sysname, os_name);
@@ -227 +233 @@
 
         cnt = pj_ansi_snprintf(tmp, sizeof(tmp),
-                               "%s%s/%s/%s%s",
+                               "%s%s%s%s%s%s%s",
                                si.os_name.ptr,
                                ver_info(si.os_ver, os_ver),
+                               (si.machine.slen ? "/" : ""),
                                si.machine.ptr,
+                               (si.sdk_name.slen ? "/" : ""),
                                si.sdk_name.ptr,
                                ver_info(si.sdk_ver, sdk_ver));