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.34 by tdb, Sun Apr 4 22:09:32 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   #endif
40   #if defined(NETBSD) || defined(OPENBSD)
# Line 420 | Line 420 | long long get_ll_match(char *line, regmatch_t *match){
420          return num;
421   }
422  
423 < #if defined(FREEBSD) || defined(DFBSD)
423 > #if (defined(FREEBSD) && !defined(FREEBSD5)) || defined(DFBSD)
424   kvm_t *get_kvm() {
425          static kvm_t *kvmd = NULL;
426  
# Line 431 | Line 431 | kvm_t *get_kvm() {
431          kvmd = kvm_openfiles(NULL, NULL, NULL, O_RDONLY, NULL);
432          return kvmd;
433   }
434 +
435 + /* Can't think of a better name for this function */
436 + kvm_t *get_kvm2() {
437 +        static kvm_t *kvmd2 = NULL;
438 +
439 +        if (kvmd2 != NULL) {
440 +                return kvmd2;
441 +        }
442 +
443 +        kvmd2 = kvm_openfiles(_PATH_DEVNULL, _PATH_DEVNULL, NULL, O_RDONLY, NULL);
444 +        return kvmd2;
445 + }
446   #endif
447  
448   #if defined(NETBSD) || defined(OPENBSD)
# Line 464 | Line 476 | int statgrab_init(){
476          {
477                  kvm_t *kvmd = get_kvm();
478                  if (kvmd == NULL) return 1;
479 +        }
480 +        {
481 +                kvm_t *kvmd2 = get_kvm2();
482 +                if (kvmd2 == NULL) return 1;
483          }
484   #endif
485   #if defined(NETBSD) || defined(OPENBSD)

Diff Legend

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