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.50 by pajs, Wed Apr 7 15:46:34 2004 UTC vs.
Revision 1.53 by ats, Sun May 30 17:07:53 2004 UTC

# Line 30 | Line 30
30   #include <stdlib.h>
31   #include <unistd.h>
32   #include <sys/types.h>
33 – #include <regex.h>
33   #ifdef ALLBSD
34   #include <fcntl.h>
35   #endif
# Line 266 | Line 265 | static int build_mapping(){
265  
266   #endif
267  
268 <
270 <
268 > #if defined(LINUX) || defined(CYGWIN)
269   char *sg_f_read_line(FILE *f, const char *string){
270          /* Max line length. 8k should be more than enough */
271          static char line[8192];
# Line 278 | Line 276 | char *sg_f_read_line(FILE *f, const char *string){
276                  }
277          }
278  
279 +        sg_set_error(SG_ERROR_PARSE, NULL);
280          return NULL;
281   }
282  
# Line 291 | Line 290 | char *sg_get_string_match(char *line, regmatch_t *matc
290          return match_string;
291   }
292  
293 + long long sg_get_ll_match(char *line, regmatch_t *match){
294 +        char *ptr;
295 +        long long num;
296  
297 +        ptr=line+match->rm_so;
298 +        num=atoll(ptr);
299  
300 +        return num;
301 + }
302 + #endif
303 +
304   #ifndef HAVE_ATOLL
305   static long long atoll(const char *s) {
306          long long value = 0;
# Line 431 | Line 439 | int sg_update_string(char **dest, const char *src) {
439          return 0;
440   }
441  
434 – long long sg_get_ll_match(char *line, regmatch_t *match){
435 –        char *ptr;
436 –        long long num;
437 –
438 –        ptr=line+match->rm_so;
439 –        num=atoll(ptr);
440 –
441 –        return num;
442 – }
443 –
442   #if (defined(FREEBSD) && !defined(FREEBSD5)) || defined(DFBSD)
443   kvm_t *sg_get_kvm() {
444          static kvm_t *kvmd = NULL;
# Line 450 | Line 448 | kvm_t *sg_get_kvm() {
448          }
449  
450          kvmd = kvm_openfiles(NULL, NULL, NULL, O_RDONLY, NULL);
451 +        if(kvmd == NULL) {
452 +                sg_set_error(SG_ERROR_KVM_OPENFILES, NULL);
453 +        }
454          return kvmd;
455   }
456  
# Line 462 | Line 463 | kvm_t *sg_get_kvm2() {
463          }
464  
465          kvmd2 = kvm_openfiles(_PATH_DEVNULL, _PATH_DEVNULL, NULL, O_RDONLY, NULL);
466 +        if(kvmd2 == NULL) {
467 +                sg_set_error(SG_ERROR_KVM_OPENFILES, NULL);
468 +        }
469          return kvmd2;
470   }
471   #endif
# Line 477 | Line 481 | struct uvmexp *sg_get_uvmexp() {
481          mib[1] = VM_UVMEXP;
482  
483          if (sysctl(mib, 2, &uvm, &size, NULL, 0) < 0) {
484 +                sg_set_error(SG_ERROR_SYSCTL, "CTL_VM.VM_UVMEXP");
485                  return NULL;
486          }
487  
# Line 485 | Line 490 | struct uvmexp *sg_get_uvmexp() {
490   #endif
491  
492   int sg_init(){
493 +        sg_set_error(SG_ERROR_NONE, NULL);
494 +
495   #if (defined(FREEBSD) && !defined(FREEBSD5)) || defined(DFBSD)
496          if (sg_get_kvm() == NULL) {
497                  return -1;
# Line 506 | Line 513 | int sg_init(){
513   }
514  
515   int sg_drop_privileges() {
516 <        if (setegid(getgid()) != 0) return -1;
517 <        if (seteuid(getuid()) != 0) return -1;
516 >        if (setegid(getgid()) != 0) {
517 >                sg_set_error(SG_ERROR_SETEGID, NULL);
518 >                return -1;
519 >        }
520 >        if (seteuid(getuid()) != 0) {
521 >                sg_set_error(SG_ERROR_SETEUID, NULL);
522 >                return -1;
523 >        }
524          return 0;
525   }
526  

Diff Legend

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