diff options
| author | Benny Prijono <bennylp@teluu.com> | 2011-02-28 22:19:23 +0000 |
|---|---|---|
| committer | Benny Prijono <bennylp@teluu.com> | 2011-02-28 22:19:23 +0000 |
| commit | 7506dc2e5de7c417ec9835bf95a29e442fa0ed37 (patch) | |
| tree | 581d81ed044c2a9a2e3bdedcf2b81fc761a494f3 /pjlib/src/pj | |
| parent | becc875a5dafe43a6067b6fb5e0c953c582fad48 (diff) | |
Re #1202 (pjlib sysinfo): testing on OpenSolaris and added pjlib-test entry
git-svn-id: http://svn.pjsip.org/repos/pjproject/trunk@3426 74dad513-b988-da41-8d7b-12977e46ad98
Diffstat (limited to 'pjlib/src/pj')
| -rw-r--r-- | pjlib/src/pj/os_info.c | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/pjlib/src/pj/os_info.c b/pjlib/src/pj/os_info.c index d82aea5c..a10a95ce 100644 --- a/pjlib/src/pj/os_info.c +++ b/pjlib/src/pj/os_info.c @@ -88,6 +88,8 @@ PJ_DEF(const pj_sys_info*) pj_get_sys_info(void) 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 @@ PJ_DEF(const pj_sys_info*) pj_get_sys_info(void) 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 @@ get_sdk_info: 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)) { |