76 |
|
"ntfs"} |
77 |
|
#endif |
78 |
|
|
79 |
– |
char *copy_string(char *orig_ptr, const char *newtext){ |
80 |
– |
|
81 |
– |
/* Maybe free if not NULL, and strdup rather than realloc and strcpy? */ |
82 |
– |
orig_ptr=realloc(orig_ptr, (1+strlen(newtext))); |
83 |
– |
if(orig_ptr==NULL){ |
84 |
– |
return NULL; |
85 |
– |
} |
86 |
– |
strcpy(orig_ptr, newtext); |
87 |
– |
|
88 |
– |
return orig_ptr; |
89 |
– |
} |
90 |
– |
|
79 |
|
static void disk_stat_init(disk_stat_t *d) { |
80 |
|
d->device_name = NULL; |
81 |
|
d->fs_type = NULL; |
165 |
|
disk_ptr=disk_stats+num_disks; |
166 |
|
|
167 |
|
#ifdef ALLBSD |
168 |
< |
if((disk_ptr->device_name=copy_string(disk_ptr->device_name, mp->f_mntfromname))==NULL){ |
168 |
> |
if (update_string(&disk_ptr->device_name, mp->f_mntfromname) == NULL) { |
169 |
|
return NULL; |
170 |
|
} |
171 |
< |
|
184 |
< |
if((disk_ptr->fs_type=copy_string(disk_ptr->fs_type, mp->f_fstypename))==NULL){ |
171 |
> |
if (update_string(&disk_ptr->fs_type, mp->f_fstypename) == NULL) { |
172 |
|
return NULL; |
173 |
|
} |
174 |
< |
|
188 |
< |
if((disk_ptr->mnt_point=copy_string(disk_ptr->mnt_point, mp->f_mntonname))==NULL){ |
174 |
> |
if (update_string(&disk_ptr->mnt_point, mp->f_mntonname) == NULL) { |
175 |
|
return NULL; |
176 |
|
} |
177 |
|
|
185 |
|
disk_ptr->used_inodes=disk_ptr->total_inodes-disk_ptr->free_inodes; |
186 |
|
#endif |
187 |
|
#if defined(LINUX) || defined(CYGWIN) |
188 |
< |
if((disk_ptr->device_name=copy_string(disk_ptr->device_name, mp->mnt_fsname))==NULL){ |
188 |
> |
if (update_string(&disk_ptr->device_name, mp->mnt_fsname) == NULL) { |
189 |
|
return NULL; |
190 |
|
} |
191 |
|
|
192 |
< |
if((disk_ptr->fs_type=copy_string(disk_ptr->fs_type, mp->mnt_type))==NULL){ |
192 |
> |
if (update_string(&disk_ptr->fs_type, mp->mnt_type) == NULL) { |
193 |
|
return NULL; |
194 |
|
} |
195 |
|
|
196 |
< |
if((disk_ptr->mnt_point=copy_string(disk_ptr->mnt_point, mp->mnt_dir))==NULL){ |
196 |
> |
if (update_string(&disk_ptr->mnt_point, mp->mnt_dir) == NULL) { |
197 |
|
return NULL; |
198 |
|
} |
199 |
|
disk_ptr->size = (long long)fs.f_bsize * (long long)fs.f_blocks; |
207 |
|
#endif |
208 |
|
|
209 |
|
#ifdef SOLARIS |
224 |
– |
/* Memory leak in event of realloc failing */ |
210 |
|
/* Maybe make this char[bigenough] and do strncpy's and put a null in the end? |
211 |
|
* Downside is its a bit hungry for a lot of mounts, as MNT_MAX_SIZE would prob |
212 |
|
* be upwards of a k each |
213 |
|
*/ |
214 |
< |
if((disk_ptr->device_name=copy_string(disk_ptr->device_name, mp.mnt_special))==NULL){ |
214 |
> |
if (update_string(&disk_ptr->device_name, mp.mnt_special) == NULL) { |
215 |
|
return NULL; |
216 |
|
} |
217 |
|
|
218 |
< |
if((disk_ptr->fs_type=copy_string(disk_ptr->fs_type, mp.mnt_fstype))==NULL){ |
218 |
> |
if (update_string(&disk_ptr->fs_type, mp.mnt_fstype) == NULL) { |
219 |
|
return NULL; |
220 |
|
} |
221 |
|
|
222 |
< |
if((disk_ptr->mnt_point=copy_string(disk_ptr->mnt_point, mp.mnt_mountp))==NULL){ |
222 |
> |
if (update_string(&disk_ptr->mnt_point, mp.mnt_mountp) == NULL) { |
223 |
|
return NULL; |
224 |
|
} |
225 |
|
|
284 |
|
char *line_ptr; |
285 |
|
int major, minor; |
286 |
|
int has_pp_stats = 1; |
287 |
< |
static partition *parts = NULL; |
303 |
< |
static int alloc_parts = 0; |
287 |
> |
VECTOR_DECLARE_STATIC(parts, partition, 16, NULL, NULL); |
288 |
|
int i, n; |
289 |
|
time_t now; |
290 |
|
const char *format; |
561 |
|
if (VECTOR_RESIZE(diskio_stats, n + 1) < 0) { |
562 |
|
goto out; |
563 |
|
} |
564 |
< |
if (n >= alloc_parts) { |
565 |
< |
alloc_parts += 16; |
582 |
< |
parts = realloc(parts, alloc_parts * sizeof *parts); |
583 |
< |
if (parts == NULL) { |
584 |
< |
alloc_parts = 0; |
585 |
< |
goto out; |
586 |
< |
} |
564 |
> |
if (VECTOR_RESIZE(parts, n + 1) < 0) { |
565 |
> |
goto out; |
566 |
|
} |
567 |
|
|
568 |
|
if (diskio_stats[n].disk_name != NULL) |