Re #1202 (pjlib sysinfo): testing on OpenSolaris and added pjlib-test entry
git-svn-id: https://svn.pjsip.org/repos/pjproject/trunk@3426 74dad513-b988-da41-8d7b-12977e46ad98
diff --git a/pjlib/src/pj/os_info.c b/pjlib/src/pj/os_info.c
index d82aea5..a10a95c 100644
--- a/pjlib/src/pj/os_info.c
+++ b/pjlib/src/pj/os_info.c
@@ -88,6 +88,8 @@
if (si_initialized)
return &si;
+ si.machine.ptr = si.os_name.ptr = si.sdk_name.ptr = si.info.ptr = "";
+
#define ALLOC_CP_STR(str,field) \
do { \
len = pj_ansi_strlen(str); \
@@ -108,8 +110,12 @@
char *tok;
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);
@@ -226,10 +232,12 @@
int cnt;
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));
if (cnt > 0 && cnt < (int)sizeof(tmp)) {