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

Comparing projects/libstatgrab/src/libstatgrab/tools.c (file contents):
Revision 1.33 by tdb, Sat Mar 20 21:28:10 2004 UTC vs.
Revision 1.40 by ats, Mon Apr 5 01:06:02 2004 UTC

# Line 34 | Line 34
34   #ifdef ALLBSD
35   #include <fcntl.h>
36   #endif
37 < #if defined(FREEBSD) || defined(DFBSD)
37 > #if (defined(FREEBSD) && !defined(FREEBSD5)) || defined(DFBSD)
38   #include <kvm.h>
39 + #include <paths.h>
40   #endif
41   #if defined(NETBSD) || defined(OPENBSD)
42   #include <uvm/uvm_extern.h>
# Line 73 | Line 74 | static mapping_t *mapping = NULL;
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)
# Line 88 | Line 89 | void add_mapping(char *bsd, char *svr){
89          mapping_t *map_ptr;
90          mapping_t *map_end_ptr;
91  
91 –        bsd = strdup(bsd);
92 –        svr = strdup(svr);
93 –
92          if (mapping == NULL){
93                  mapping = malloc(sizeof(mapping_t));
94                  if (mapping == NULL) return;
# Line 113 | Line 111 | void add_mapping(char *bsd, char *svr){
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   }
# Line 215 | Line 213 | int build_mapping(){
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) {
# Line 410 | Line 408 | size_t strlcat(char *dst, const char *src, size_t siz)
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;
# Line 420 | Line 431 | long long get_ll_match(char *line, regmatch_t *match){
431          return num;
432   }
433  
434 < #if defined(FREEBSD) || defined(DFBSD)
434 > #if (defined(FREEBSD) && !defined(FREEBSD5)) || defined(DFBSD)
435   kvm_t *get_kvm() {
436          static kvm_t *kvmd = NULL;
437  
# Line 431 | Line 442 | kvm_t *get_kvm() {
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   #if defined(NETBSD) || defined(OPENBSD)
# Line 438 | Line 461 | struct uvmexp *get_uvmexp() {
461          int mib[2];
462          size_t size;
463          static struct uvmexp *uvm = NULL;
464 +        struct uvmexp *new;
465  
466          mib[0] = CTL_VM;
467          mib[1] = VM_UVMEXP;
# Line 446 | Line 470 | struct uvmexp *get_uvmexp() {
470                  return NULL;
471          }
472  
473 <        uvm = realloc(uvm, size);
474 <        if (uvm == NULL) {
473 >        new = realloc(uvm, size);
474 >        if (new == NULL) {
475                  return NULL;
476          }
477 +        uvm = new;
478  
479          if (sysctl(mib, 2, uvm, &size, NULL, 0) < 0) {
480                  return NULL;
# Line 464 | Line 489 | int statgrab_init(){
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   #if defined(NETBSD) || defined(OPENBSD)

Diff Legend

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