ViewVC Help
View File | Revision Log | Show Annotations | Revision Graph | Root Listing
root/i-scream/projects/libstatgrab/src/libstatgrab/user_stats.c
(Generate patch)

Comparing projects/libstatgrab/src/libstatgrab/user_stats.c (file contents):
Revision 1.6 by pajs, Sun Mar 2 16:43:48 2003 UTC vs.
Revision 1.10 by ats, Sun Oct 19 02:03:02 2003 UTC

# Line 1 | Line 1
1   /*
2   * i-scream central monitoring system
3 < * http://www.i-scream.org.uk
4 < * Copyright (C) 2000-2002 i-scream
3 > * http://www.i-scream.org
4 > * Copyright (C) 2000-2003 i-scream
5   *
6   * This program is free software; you can redistribute it and/or
7   * modify it under the terms of the GNU General Public License
# Line 25 | Line 25
25   #include <stdlib.h>
26   #include <stdio.h>
27   #include <string.h>
28 – #include <utmp.h>
28   #include "statgrab.h"
29 + #ifdef ALLBSD
30 + #include <sys/types.h>
31 + #endif
32 + #include <utmp.h>
33 + #ifdef NETBSD
34 + #include <limits.h>
35 + #undef MAX_LOGIN_NAME_SIZE
36 + #define MAX_LOGIN_NAME_SIZE _POSIX_LOGIN_NAME_MAX
37 + #endif
38  
39   #define START_VAL (5*(1+MAX_LOGIN_NAME_SIZE))
40  
# Line 36 | Line 44 | user_stat_t *get_user_stats(){
44          static user_stat_t user_stats;
45          static int size_of_namelist=-1;
46          char *tmp;
47 + #if defined(SOLARIS) || defined(LINUX)  
48          struct utmp *entry;
49 + #endif
50 + #ifdef ALLBSD
51 +        struct utmp entry;
52 +        FILE *f;
53 + #endif
54  
55          /* First case call */
56          if (size_of_namelist==-1){
# Line 49 | Line 63 | user_stat_t *get_user_stats(){
63  
64          /* Essentially blank the list, or give it a inital starting string */
65          strcpy(user_stats.name_list, "");
66 +
67 + #if defined(SOLARIS) || defined(LINUX)  
68          setutent();
69          while((entry=getutent()) != NULL) {
70                  if(entry->ut_type==USER_PROCESS) {
# Line 68 | Line 84 | user_stat_t *get_user_stats(){
84                  }
85          }
86          endutent();
87 + #endif
88 + #ifdef ALLBSD
89 +        if ((f=fopen(_PATH_UTMP, "r")) == NULL){
90 +                return NULL;
91 +        }
92 +        while((fread(&entry, sizeof(entry),1,f)) != 0){
93 +                if (entry.ut_name[0] == '\0') continue;
94 +                if((strlen(user_stats.name_list)+MAX_LOGIN_NAME_SIZE+2) > size_of_namelist){
95 +                        tmp=user_stats.name_list;
96 +                        user_stats.name_list=realloc(user_stats.name_list, 1+(size_of_namelist*2));
97 +                        if(user_stats.name_list==NULL){
98 +                                user_stats.name_list=tmp;
99 +                                return NULL;
100 +                        }
101 +                        size_of_namelist=1+(size_of_namelist*2);
102 +                        
103 +                }
104 +                strncat(user_stats.name_list, entry.ut_name, MAX_LOGIN_NAME_SIZE);
105 +                strcat(user_stats.name_list, " ");
106 +                num_users++;
107 +        }
108 +        fclose(f);
109  
110 + #endif  
111          /* We want to remove the last " " */
112 <        tmp=strrchr(user_stats.name_list, ' ');
113 <        *tmp='\0';
114 <        user_stats.num_entries=num_users;
112 >        if(num_users!=0){
113 >                tmp=strrchr(user_stats.name_list, ' ');
114 >                if(tmp!=NULL){
115 >                        *tmp='\0';
116 >                        user_stats.num_entries=num_users;
117 >                }
118 >        }
119  
120          return &user_stats;
121  

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines