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

Comparing projects/cms/source/ihost/libstatgrab/disk_stat.c (file contents):
Revision 1.4 by pajs, Mon May 13 12:47:15 2002 UTC vs.
Revision 1.13 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 <stdlib.h>
26   #include <stdio.h>
27   #include "ukcprog.h"
# Line 37 | Line 61 | char *get_disk_stats(){
61          system_disks_t *sd_ptr=sd;
62          int counter=0;
63          char *xml_disk_stats;
64 +        char *xml_disk_stats_ptr;
65   #ifdef SOLARIS
66          struct mnttab mp;
67          struct statvfs df;
# Line 90 | Line 115 | char *get_disk_stats(){
115  
116          }
117  
118 +        if((fclose(f))!=0){
119 +                errf("Failed to close mnttab");
120 +                return NULL;
121 +        }
122 +
123   #endif
124 < #ifdef linux
125 <        if ((f=fopen("/etc/mtab", "r" ))==NULL){
124 > #ifdef LINUX
125 >        if ((f=setmntent("/etc/mtab", "r" ))==NULL){
126                  errf("Failed to open mounts (%m)");
127                  return NULL;
128          }
# Line 128 | Line 158 | char *get_disk_stats(){
158                  sd_ptr->next_disk=sd;
159                  sd=sd_ptr;
160          }
161 +
162 +        endmntent(f);
163 +
164   #endif
165   #ifdef FREEBSD
166          nummnt=getmntinfo(&mp , MNT_LOCAL);
# Line 168 | Line 201 | char *get_disk_stats(){
201          sd_ptr=sd;
202          xml_disk_stats=strdup("<disk>");
203          
204 <        while(sd_ptr!=NULL){
204 >        for(counter=0;sd_ptr!=NULL;counter++){
205 >                xml_disk_stats_ptr=xml_disk_stats;
206                  if((xml_disk_stats=strf("%s<p%d name=\"%s\" mount=\"%s\" kbytes=\"%ld\" used=\"%ld\" avail=\"%ld\" totalinodes=\"%ld\" freeinodes=\"%ld\"></p%d>", xml_disk_stats, counter, sd_ptr->disk->device_name, sd_ptr->disk->mnt_point, sd_ptr->disk->size, sd_ptr->disk->used, sd_ptr->disk->avail, sd_ptr->disk->t_inodes, sd_ptr->disk->f_inodes, counter)) == NULL){
207                          errf("strf failed (%m)");
208                          return NULL;
209                  }
210 +                free(xml_disk_stats_ptr);
211                  sd_ptr=sd_ptr->next_disk;
177                counter++;
212          }
213 <
213 >        xml_disk_stats_ptr=xml_disk_stats;
214          xml_disk_stats=strf("%s</disk>",xml_disk_stats);
215 +        free(xml_disk_stats_ptr);      
216 +
217 +        /* Cleaning up */
218 +        sd_ptr=sd;
219 +        while(sd_ptr!=NULL){
220 +                sd=sd_ptr->next_disk;
221 +                free(sd_ptr->disk->device_name);
222 +                free(sd_ptr->disk->mnt_point);
223 +                free(sd_ptr->disk);
224 +                free(sd_ptr);
225 +                sd_ptr=sd;
226 +        }
227  
228          return xml_disk_stats;
229   }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines