61 |
|
#include <paths.h> |
62 |
|
#include <fcntl.h> |
63 |
|
#include <limits.h> |
64 |
+ |
#if (defined(FREEBSD) && !defined(FREEBSD5)) || defined(DFBSD) |
65 |
|
#include <kvm.h> |
66 |
+ |
#include <tools.h> |
67 |
|
#endif |
68 |
+ |
#include <unistd.h> |
69 |
+ |
#endif |
70 |
|
|
71 |
|
int get_proc_snapshot(proc_state_t **ps){ |
72 |
|
proc_state_t *proc_state = NULL; |
76 |
|
int mib[4]; |
77 |
|
size_t size; |
78 |
|
struct kinfo_proc *kp_stats; |
79 |
< |
int procs, i, alloc; |
79 |
> |
int procs, i; |
80 |
|
char *proctitle; |
81 |
< |
#if defined(FREEBSD5) || defined(NETBSD) || defined(OPENBSD) |
81 |
> |
#if (defined(FREEBSD) && !defined(FREEBSD5)) || defined(DFBSD) |
82 |
> |
kvm_t *kvmd; |
83 |
> |
char **args; |
84 |
> |
int alloc; |
85 |
> |
char *proctitletmp; |
86 |
> |
#else |
87 |
|
long buflen; |
88 |
|
char *p; |
80 |
– |
int argc; |
81 |
– |
int j = 0; |
82 |
– |
#else |
83 |
– |
static kvm_t *kvmd; |
84 |
– |
char **args; |
89 |
|
#endif |
90 |
|
#endif |
91 |
|
#if defined(SOLARIS) || defined(LINUX) |
239 |
|
} |
240 |
|
|
241 |
|
#if (defined(FREEBSD) && !defined(FREEBSD5)) || defined(DFBSD) |
242 |
< |
kvmd = kvm_openfiles(_PATH_DEVNULL, _PATH_DEVNULL, NULL, O_RDONLY, NULL); |
242 |
> |
kvmd = get_kvm2(); |
243 |
|
#endif |
244 |
|
|
245 |
|
for (i = 0; i < procs; i++) { |
298 |
|
proc_state_ptr->proctitle = NULL; |
299 |
|
} |
300 |
|
else if(size > 0) { |
301 |
< |
proc_state_ptr->proctitle = malloc(size); |
301 |
> |
proc_state_ptr->proctitle = malloc(size+1); |
302 |
|
if(proc_state_ptr->proctitle == NULL) { |
303 |
|
return NULL; |
304 |
|
} |
305 |
|
p = proctitle; |
306 |
|
proc_state_ptr->proctitle[0] = NULL; |
307 |
|
do { |
308 |
< |
strncat(proc_state_ptr->proctitle, p, strlen(p)); |
309 |
< |
strncat(proc_state_ptr->proctitle, " ", 1); |
308 |
> |
strlcat(proc_state_ptr->proctitle, p, size+1); |
309 |
> |
strlcat(proc_state_ptr->proctitle, " ", size+1); |
310 |
|
p += strlen(p) + 1; |
311 |
|
} while (p < proctitle + size); |
312 |
|
free(proctitle); |
313 |
< |
proc_state_ptr->proctitle[strlen(proc_state_ptr->proctitle)-1] = NULL; |
313 |
> |
/* remove trailing space */ |
314 |
> |
proc_state_ptr->proctitle[strlen(proc_state_ptr->proctitle)-1] = '\0'; |
315 |
|
} |
316 |
|
else { |
317 |
|
free(proctitle); |
328 |
|
} |
329 |
|
while(*args != NULL) { |
330 |
|
if(strlen(proctitle) + strlen(*args) >= alloc) { |
331 |
< |
alloc = (alloc + strlen(*args)) << 1; |
332 |
< |
proctitle = realloc(proctitle, alloc); |
333 |
< |
if(proctitle == NULL) { |
331 |
> |
alloc = (alloc + strlen(*args)) * 2; |
332 |
> |
proctitletmp = realloc(proctitle, alloc); |
333 |
> |
if(proctitletmp == NULL) { |
334 |
|
return NULL; |
335 |
|
} |
336 |
+ |
proctitle = proctitletmp; |
337 |
|
} |
338 |
< |
strncat(proctitle, *args, strlen(*args)); |
339 |
< |
strncat(proctitle, " ", 1); |
338 |
> |
strlcat(proctitle, *args, alloc); |
339 |
> |
strlcat(proctitle, " ", alloc); |
340 |
|
args++; |
341 |
|
} |
342 |
|
/* remove trailing space */ |
343 |
< |
proctitle[strlen(proctitle)-1] = NULL; |
343 |
> |
proctitle[strlen(proctitle)-1] = '\0'; |
344 |
|
proc_state_ptr->proctitle = proctitle; |
345 |
|
} |
346 |
|
else { |