| 33 |
|
#include <regex.h> |
| 34 |
|
#ifdef ALLBSD |
| 35 |
|
#include <fcntl.h> |
| 36 |
+ |
#endif |
| 37 |
+ |
#if (defined(FREEBSD) && !defined(FREEBSD5)) || defined(DFBSD) |
| 38 |
|
#include <kvm.h> |
| 39 |
+ |
#include <paths.h> |
| 40 |
|
#endif |
| 41 |
< |
#ifdef NETBSD |
| 41 |
> |
#if defined(NETBSD) || defined(OPENBSD) |
| 42 |
|
#include <uvm/uvm_extern.h> |
| 43 |
+ |
#include <sys/param.h> |
| 44 |
+ |
#include <sys/sysctl.h> |
| 45 |
|
#endif |
| 46 |
|
|
| 47 |
|
#include "tools.h" |
| 48 |
|
|
| 49 |
|
#ifdef SOLARIS |
| 50 |
+ |
#ifdef HAVE_LIBDEVINFO_H |
| 51 |
|
#include <libdevinfo.h> |
| 52 |
+ |
#endif |
| 53 |
|
#include <kstat.h> |
| 54 |
|
#include <unistd.h> |
| 55 |
|
#include <ctype.h> |
| 74 |
|
#endif |
| 75 |
|
|
| 76 |
|
#ifdef SOLARIS |
| 77 |
< |
char *get_svr_from_bsd(char *bsd){ |
| 77 |
> |
const char *get_svr_from_bsd(const char *bsd){ |
| 78 |
|
#ifdef HAVE_LIBDEVINFO_H |
| 79 |
|
mapping_t *map_ptr; |
| 80 |
|
for(map_ptr = mapping; map_ptr != NULL; map_ptr = map_ptr->next) |
| 89 |
|
mapping_t *map_ptr; |
| 90 |
|
mapping_t *map_end_ptr; |
| 91 |
|
|
| 85 |
– |
bsd = strdup(bsd); |
| 86 |
– |
svr = strdup(svr); |
| 87 |
– |
|
| 92 |
|
if (mapping == NULL){ |
| 93 |
|
mapping = malloc(sizeof(mapping_t)); |
| 94 |
|
if (mapping == NULL) return; |
| 111 |
|
} |
| 112 |
|
|
| 113 |
|
map_ptr->next = NULL; |
| 114 |
< |
map_ptr->bsd = bsd; |
| 115 |
< |
map_ptr->svr = svr; |
| 114 |
> |
map_ptr->bsd = strdup(bsd); |
| 115 |
> |
map_ptr->svr = strdup(svr); |
| 116 |
|
|
| 117 |
|
return; |
| 118 |
|
} |
| 213 |
|
int found; |
| 214 |
|
|
| 215 |
|
if ((kc = kstat_open()) == NULL) { |
| 216 |
< |
return; |
| 216 |
> |
return 1; |
| 217 |
|
} |
| 218 |
|
|
| 219 |
|
for (ksp = kc->kc_chain; ksp; ksp = ksp->ks_next) { |
| 408 |
|
|
| 409 |
|
#endif |
| 410 |
|
|
| 411 |
+ |
char *update_string(char **dest, const char *src) { |
| 412 |
+ |
char *new; |
| 413 |
+ |
|
| 414 |
+ |
new = realloc(*dest, strlen(src) + 1); |
| 415 |
+ |
if (new == NULL) { |
| 416 |
+ |
return NULL; |
| 417 |
+ |
} |
| 418 |
+ |
|
| 419 |
+ |
strcpy(new, src); |
| 420 |
+ |
*dest = new; |
| 421 |
+ |
return new; |
| 422 |
+ |
} |
| 423 |
+ |
|
| 424 |
|
long long get_ll_match(char *line, regmatch_t *match){ |
| 425 |
|
char *ptr; |
| 426 |
|
long long num; |
| 431 |
|
return num; |
| 432 |
|
} |
| 433 |
|
|
| 434 |
< |
#ifdef ALLBSD |
| 434 |
> |
#if (defined(FREEBSD) && !defined(FREEBSD5)) || defined(DFBSD) |
| 435 |
|
kvm_t *get_kvm() { |
| 436 |
|
static kvm_t *kvmd = NULL; |
| 437 |
|
|
| 442 |
|
kvmd = kvm_openfiles(NULL, NULL, NULL, O_RDONLY, NULL); |
| 443 |
|
return kvmd; |
| 444 |
|
} |
| 445 |
+ |
|
| 446 |
+ |
/* Can't think of a better name for this function */ |
| 447 |
+ |
kvm_t *get_kvm2() { |
| 448 |
+ |
static kvm_t *kvmd2 = NULL; |
| 449 |
+ |
|
| 450 |
+ |
if (kvmd2 != NULL) { |
| 451 |
+ |
return kvmd2; |
| 452 |
+ |
} |
| 453 |
+ |
|
| 454 |
+ |
kvmd2 = kvm_openfiles(_PATH_DEVNULL, _PATH_DEVNULL, NULL, O_RDONLY, NULL); |
| 455 |
+ |
return kvmd2; |
| 456 |
+ |
} |
| 457 |
|
#endif |
| 458 |
|
|
| 459 |
< |
#ifdef NETBSD |
| 459 |
> |
#if defined(NETBSD) || defined(OPENBSD) |
| 460 |
|
struct uvmexp *get_uvmexp() { |
| 461 |
< |
static u_long addr = 0; |
| 462 |
< |
static struct uvmexp uvm; |
| 463 |
< |
kvm_t *kvmd = get_kvm(); |
| 461 |
> |
int mib[2]; |
| 462 |
> |
size_t size; |
| 463 |
> |
static struct uvmexp *uvm = NULL; |
| 464 |
> |
struct uvmexp *new; |
| 465 |
|
|
| 466 |
< |
if (kvmd == NULL) { |
| 466 |
> |
mib[0] = CTL_VM; |
| 467 |
> |
mib[1] = VM_UVMEXP; |
| 468 |
> |
|
| 469 |
> |
if (sysctl(mib, 2, NULL, &size, NULL, 0) < 0) { |
| 470 |
|
return NULL; |
| 471 |
|
} |
| 472 |
|
|
| 473 |
< |
if (addr == 0) { |
| 474 |
< |
struct nlist symbols[] = { |
| 475 |
< |
{ "_uvmexp" }, |
| 443 |
< |
{ NULL } |
| 444 |
< |
}; |
| 445 |
< |
|
| 446 |
< |
if (kvm_nlist(kvmd, symbols) != 0) { |
| 447 |
< |
return NULL; |
| 448 |
< |
} |
| 449 |
< |
addr = symbols[0].n_value; |
| 473 |
> |
new = realloc(uvm, size); |
| 474 |
> |
if (new == NULL) { |
| 475 |
> |
return NULL; |
| 476 |
|
} |
| 477 |
+ |
uvm = new; |
| 478 |
|
|
| 479 |
< |
if (kvm_read(kvmd, addr, &uvm, sizeof uvm) != sizeof uvm) { |
| 479 |
> |
if (sysctl(mib, 2, uvm, &size, NULL, 0) < 0) { |
| 480 |
|
return NULL; |
| 481 |
|
} |
| 482 |
< |
return &uvm; |
| 482 |
> |
|
| 483 |
> |
return uvm; |
| 484 |
|
} |
| 485 |
|
#endif |
| 486 |
|
|
| 487 |
|
int statgrab_init(){ |
| 488 |
< |
#ifdef ALLBSD |
| 488 |
> |
#if (defined(FREEBSD) && !defined(FREEBSD5)) || defined(DFBSD) |
| 489 |
|
{ |
| 490 |
|
kvm_t *kvmd = get_kvm(); |
| 491 |
|
if (kvmd == NULL) return 1; |
| 492 |
|
} |
| 493 |
+ |
{ |
| 494 |
+ |
kvm_t *kvmd2 = get_kvm2(); |
| 495 |
+ |
if (kvmd2 == NULL) return 1; |
| 496 |
+ |
} |
| 497 |
|
#endif |
| 498 |
< |
#ifdef NETBSD |
| 498 |
> |
#if defined(NETBSD) || defined(OPENBSD) |
| 499 |
|
{ |
| 500 |
+ |
/* This should always succeed, but it seems that on some |
| 501 |
+ |
* versions of NetBSD the first call to get_uvmexp will return |
| 502 |
+ |
* a non-filled-in structure; this is a workaround for that. |
| 503 |
+ |
*/ |
| 504 |
|
struct uvmexp *uvm = get_uvmexp(); |
| 505 |
|
if (uvm == NULL) return 1; |
| 506 |
|
} |
