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.4 by pajs, Sat Mar 1 02:38:22 2003 UTC vs.
Revision 1.16 by tdb, Wed Jan 21 11:32:27 2004 UTC

# Line 1 | Line 1
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-2004 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
8 < * as published by the Free Software Foundation; either version 2
9 < * of the License, or (at your option) any later version.
6 > * This library is free software; you can redistribute it and/or
7 > * modify it under the terms of the GNU Lesser General Public
8 > * License as published by the Free Software Foundation; either
9 > * version 2.1 of the License, or (at your option) any later version.
10   *
11 < * This program is distributed in the hope that it will be useful,
11 > * This library is distributed in the hope that it will be useful,
12   * but WITHOUT ANY WARRANTY; without even the implied warranty of
13 < * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
14 < * GNU General Public License for more details.
13 > * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
14 > * Lesser General Public License for more details.
15   *
16 < * You should have received a copy of the GNU General Public License
17 < * along with this program; if not, write to the Free Software
18 < * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
16 > * You should have received a copy of the GNU Lesser General Public
17 > * License along with this library; if not, write to the Free Software
18 > * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
19 > * 02111-1307 USA
20 > *
21 > * $Id$
22   */
23  
24   #ifdef HAVE_CONFIG_H
# Line 25 | Line 28
28   #include <stdlib.h>
29   #include <stdio.h>
30   #include <string.h>
28 #include <utmp.h>
31   #include "statgrab.h"
32 + #ifdef ALLBSD
33 + #include <sys/types.h>
34 + #endif
35 + #include <utmp.h>
36 + #ifdef CYGWIN
37 + #include <sys/unistd.h>
38 + #endif
39  
40 < #define START_VAL 5
40 > #ifdef SOLARIS
41 > #define MAX_LOGIN_NAME_SIZE 8
42 > #endif
43 > #if defined(LINUX) || defined(FREEBSD)
44 > #define MAX_LOGIN_NAME_SIZE UT_NAMESIZE
45 > #endif
46 > #ifdef NETBSD
47 > #define MAX_LOGIN_NAME_SIZE _POSIX_LOGIN_NAME_MAX
48 > #endif
49 > #if defined(CYGWIN)
50 > #define MAX_LOGIN_NAME_SIZE _SC_LOGIN_NAME_MAX
51 > #endif
52  
53 + #define START_VAL (5*(1+MAX_LOGIN_NAME_SIZE))
54 +
55   user_stat_t *get_user_stats(){
56          int num_users=0;
57  
58 <        static user_stat_t user_stat;
59 <        static int watermark=-1;
58 >        static user_stat_t user_stats;
59 >        static int size_of_namelist=-1;
60 >        char *tmp;
61 > #if defined(SOLARIS) || defined(LINUX) || defined(CYGWIN)
62          struct utmp *entry;
63 + #endif
64 + #ifdef ALLBSD
65 +        struct utmp entry;
66 +        FILE *f;
67 + #endif
68  
40        name *name_ptr;
41
69          /* First case call */
70 <        if (watermark==-1){
71 <                user_stat.name_list=malloc(START_VAL * sizeof(user_stat.name_list));
72 <                if(user_stat.name_list==NULL){
70 >        if (size_of_namelist==-1){
71 >                user_stats.name_list=malloc(START_VAL);
72 >                if(user_stats.name_list==NULL){
73                          return NULL;
74                  }
75 <                watermark=START_VAL;
75 >                size_of_namelist=START_VAL;
76          }      
77  
78 +        /* Essentially blank the list, or give it a inital starting string */
79 +        strcpy(user_stats.name_list, "");
80 +
81 + #if defined(SOLARIS) || defined(LINUX) || defined(CYGWIN)
82          setutent();
83          while((entry=getutent()) != NULL) {
84                  if(entry->ut_type==USER_PROCESS) {
85 <                        if(num_users>watermark-1){
86 <                                name_ptr=user_stat.name_list;
87 <                                if((user_stat.name_list=realloc(user_stat.name_list, (watermark*2* sizeof(user_stat.name_list))))==NULL){
88 <                                        user_stat.name_list=name_ptr;
85 >                        if((strlen(user_stats.name_list)+MAX_LOGIN_NAME_SIZE+2) > size_of_namelist){
86 >                                tmp=user_stats.name_list;
87 >                                user_stats.name_list=realloc(user_stats.name_list, 1+(size_of_namelist*2));
88 >                                if(user_stats.name_list==NULL){
89 >                                        user_stats.name_list=tmp;
90                                          return NULL;
91                                  }
92 <                                watermark=watermark*2;
92 >                                size_of_namelist=1+(size_of_namelist*2);
93                          }
94  
95 <                        strncpy(user_stat.name_list[num_users], entry->ut_user, MAX_LOGIN_NAME_SIZE);
96 <                        /* NULL terminate just in case , the size of user_stat.name_list is MAX_LOGIN_NAME_SIZE+1 */
65 <
66 <                        user_stat.name_list[num_users][MAX_LOGIN_NAME_SIZE]='\0';
67 <                                
95 >                        strncat(user_stats.name_list, entry->ut_user, MAX_LOGIN_NAME_SIZE);
96 >                        strcat(user_stats.name_list, " ");
97                          num_users++;
98                  }
99          }
100          endutent();
101 <        user_stat.num_entries=num_users;
101 > #endif
102 > #ifdef ALLBSD
103 >        if ((f=fopen(_PATH_UTMP, "r")) == NULL){
104 >                return NULL;
105 >        }
106 >        while((fread(&entry, sizeof(entry),1,f)) != 0){
107 >                if (entry.ut_name[0] == '\0') continue;
108 >                if((strlen(user_stats.name_list)+MAX_LOGIN_NAME_SIZE+2) > size_of_namelist){
109 >                        tmp=user_stats.name_list;
110 >                        user_stats.name_list=realloc(user_stats.name_list, 1+(size_of_namelist*2));
111 >                        if(user_stats.name_list==NULL){
112 >                                user_stats.name_list=tmp;
113 >                                return NULL;
114 >                        }
115 >                        size_of_namelist=1+(size_of_namelist*2);
116 >                        
117 >                }
118 >                strncat(user_stats.name_list, entry.ut_name, MAX_LOGIN_NAME_SIZE);
119 >                strcat(user_stats.name_list, " ");
120 >                num_users++;
121 >        }
122 >        fclose(f);
123  
124 <        return &user_stat;
124 > #endif  
125 >        /* We want to remove the last " " */
126 >        if(num_users!=0){
127 >                tmp=strrchr(user_stats.name_list, ' ');
128 >                if(tmp!=NULL){
129 >                        *tmp='\0';
130 >                        user_stats.num_entries=num_users;
131 >                }
132 >        }
133 >
134 >        return &user_stats;
135  
136   }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines