bughz
/
sigar
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix who_list on aix, struct utmp is not binary compatible

This commit is contained in:
Doug MacEachern 2005-09-24 22:37:21 +00:00
parent 24296593f7
commit 5ba12f568d
2 changed files with 102 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

99
src/os/aix/aix_sigar.c
View File

@ -873,6 +873,105 @@ int sigar_uptime_get(sigar_t *sigar,
return SIGAR_OK;
}
#define WHOCPY(dest, src) \
SIGAR_SSTRCPY(dest, src); \
if (sizeof(src) < sizeof(dest)) \
dest[sizeof(src)] = '\0'
static int who_v4(sigar_t *sigar, sigar_who_list_t *wholist, FILE *fp)
{
struct utmp ut;
while (fread(&ut, sizeof(ut), 1, fp) == 1) {
sigar_who_t *who;
if (*ut.ut_name == '\0') {
continue;
}
if (ut.ut_type != USER_PROCESS) {
continue;
}
SIGAR_WHO_LIST_GROW(wholist);
who = &wholist->data[wholist->number++];
WHOCPY(who->user, ut.ut_user);
WHOCPY(who->device, ut.ut_line);
WHOCPY(who->host, ut.ut_host);
who->time = ut.ut_time;
}
return SIGAR_OK;
}
static int who_v5(sigar_t *sigar, sigar_who_list_t *wholist, FILE *fp)
{
struct utmp_v5 ut;
while (fread(&ut, sizeof(ut), 1, fp) == 1) {
sigar_who_t *who;
if (*ut.ut_name == '\0') {
continue;
}
if (ut.ut_type != USER_PROCESS) {
continue;
}
SIGAR_WHO_LIST_GROW(wholist);
who = &wholist->data[wholist->number++];
WHOCPY(who->user, ut.ut_user);
WHOCPY(who->device, ut.ut_line);
WHOCPY(who->host, ut.ut_host);
who->time = ut.ut_time;
}
return SIGAR_OK;
}
static int sigar_who_utmp(sigar_t *sigar,
sigar_who_list_t *wholist)
{
int status;
FILE *fp;
if (!(fp = fopen(UTMP_FILE, "r"))) {
return errno;
}
if (sigar->aix_version == 4) {
status = who_v4(sigar, wholist, fp);
}
else {
status = who_v5(sigar, wholist, fp);
}
fclose(fp);
return status;
}
int sigar_who_list_get(sigar_t *sigar,
sigar_who_list_t *wholist)
{
int status;
sigar_who_list_create(wholist);
status = sigar_who_utmp(sigar, wholist);
if (status != SIGAR_OK) {
sigar_who_list_destroy(sigar, wholist);
return status;
}
return SIGAR_OK;
}
int sigar_loadavg_get(sigar_t *sigar,
sigar_loadavg_t *loadavg)
{

4
src/sigar.c
View File

@ -789,7 +789,7 @@ static char *getpass(const char *prompt)
# define ut_user ut_name
#endif
#ifndef NETWARE
#if !defined(NETWARE) && !defined(_AIX)
#define WHOCPY(dest, src) \
SIGAR_SSTRCPY(dest, src); \
@ -1061,6 +1061,7 @@ int sigar_who_list_get(sigar_t *sigar,
}
#else
#ifndef _AIX
int sigar_who_list_get(sigar_t *sigar,
sigar_who_list_t *wholist)
{
@ -1076,6 +1077,7 @@ int sigar_who_list_get(sigar_t *sigar,
return SIGAR_OK;
}
#endif
static int sigar_get_default_gateway(sigar_t *sigar,
char *gateway)