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.8 by tdb, Wed May 29 19:41:59 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 + #ifdef HAVE_CONFIG_H
22 + #include "config.h"
23 + #endif
24 +
25   #include "ukcprog.h"
26   #include <stdlib.h>
27   #include <stdio.h>
# Line 21 | Line 45 | char *get_user_stats(){
45   #endif
46  
47   #if defined(LINUX) || defined(SOLARIS)
48 +        setutent();
49          while((entry=getutent()) != NULL) {
50                  if(entry->ut_type==USER_PROCESS) {
51                          user_tmp=user_list;
# Line 33 | Line 58 | char *get_user_stats(){
58                          nousers++;
59                  }
60          }
61 +        endutent();
62   #endif
63  
64   #ifdef FREEBSD
# Line 52 | Line 78 | char *get_user_stats(){
78                  if(user_tmp!=NULL) free(user_tmp);
79                  nousers++;
80          }
81 +
82 +        if ((fclose(f)) != 0) {
83 +                errf("Failed to close file (%m)");
84 +                return NULL;
85 +        }
86 +
87   #endif
88 <        if (user_list==NULL) user_list=strdup("");
89 <        xml_user_data=strf("<users><list>%s</list><count>%d</count></users>",user_list,nousers);
88 >        if (user_list==NULL){
89 >                if((user_list=strdup("")) == NULL){
90 >                        errf("strdup failed (%m)");
91 >                        return NULL;
92 >                }
93 >        }
94 >        if((xml_user_data=strf("<users><list>%s</list><count>%d</count></users>",user_list,nousers)) == NULL){
95 >                errf("strf failed (%m)");
96 >                return NULL;
97 >        }
98          if (user_list!=NULL) free(user_list);
99          return xml_user_data;
100   }

Diff Legend

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