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

Comparing projects/cms/source/ihost/libstatgrab/user_stats.c (file contents):
Revision 1.2 by pajs, Thu May 16 17:02:43 2002 UTC vs.
Revision 1.7 by tdb, Tue May 21 16:47:12 2002 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
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.
10 + *
11 + * This program 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.
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.
19 + */
20 +
21   #include "ukcprog.h"
22   #include <stdlib.h>
23   #include <stdio.h>
# Line 21 | Line 41 | char *get_user_stats(){
41   #endif
42  
43   #if defined(LINUX) || defined(SOLARIS)
44 +        setutent();
45          while((entry=getutent()) != NULL) {
46                  if(entry->ut_type==USER_PROCESS) {
47                          user_tmp=user_list;
# Line 33 | Line 54 | char *get_user_stats(){
54                          nousers++;
55                  }
56          }
57 +        endutent();
58   #endif
59  
60   #ifdef FREEBSD
# Line 52 | Line 74 | char *get_user_stats(){
74                  if(user_tmp!=NULL) free(user_tmp);
75                  nousers++;
76          }
77 +
78 +        if ((fclose(f)) != 0) {
79 +                errf("Failed to close file (%m)");
80 +                return NULL;
81 +        }
82 +
83   #endif
84 <        if (user_list==NULL) user_list=strdup("");
85 <        xml_user_data=strf("<users><list>%s</list><count>%d</count></users>",user_list,nousers);
84 >        if (user_list==NULL){
85 >                if((user_list=strdup("")) == NULL){
86 >                        errf("strdup failed (%m)");
87 >                        return NULL;
88 >                }
89 >        }
90 >        if((xml_user_data=strf("<users><list>%s</list><count>%d</count></users>",user_list,nousers)) == NULL){
91 >                errf("strf failed (%m)");
92 >                return NULL;
93 >        }
94          if (user_list!=NULL) free(user_list);
95          return xml_user_data;
96   }

Diff Legend

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