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.53 by ats, Sun May 30 17:07:53 2004 UTC vs.
Revision 1.60 by tdb, Sat Nov 6 19:09:00 2004 UTC

# Line 42 | Line 42
42   #include <sys/param.h>
43   #include <sys/sysctl.h>
44   #endif
45 + #ifdef HPUX
46 + #include <sys/param.h>
47 + #include <sys/pstat.h>
48 + #endif
49  
50   #include "tools.h"
51   #include "statgrab.h"
# Line 290 | Line 294 | char *sg_get_string_match(char *line, regmatch_t *matc
294          return match_string;
295   }
296  
297 < 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 <
297 > /* FIXME do Linux and Cygwin always have atoll? */
298   #ifndef HAVE_ATOLL
299   static long long atoll(const char *s) {
300          long long value = 0;
# Line 321 | Line 315 | static long long atoll(const char *s) {
315   }
316   #endif
317  
318 + long long sg_get_ll_match(char *line, regmatch_t *match){
319 +        char *ptr;
320 +        long long num;
321 +
322 +        ptr=line+match->rm_so;
323 +        num=atoll(ptr);
324 +
325 +        return num;
326 + }
327 + #endif
328 +
329   /*      $OpenBSD: strlcpy.c,v 1.8 2003/06/17 21:56:24 millert Exp $     */
330  
331   /*
# Line 481 | Line 486 | struct uvmexp *sg_get_uvmexp() {
486          mib[1] = VM_UVMEXP;
487  
488          if (sysctl(mib, 2, &uvm, &size, NULL, 0) < 0) {
489 <                sg_set_error(SG_ERROR_SYSCTL, "CTL_VM.VM_UVMEXP");
489 >                sg_set_error_with_errno(SG_ERROR_SYSCTL, "CTL_VM.VM_UVMEXP");
490                  return NULL;
491          }
492  
# Line 489 | Line 494 | struct uvmexp *sg_get_uvmexp() {
494   }
495   #endif
496  
497 + #ifdef HPUX
498 + struct pst_static *sg_get_pstat_static() {
499 +        static int got = 0;
500 +        static struct pst_static pst;
501 +
502 +        if (!got) {
503 +                if (pstat_getstatic(&pst, sizeof pst, 1, 0) == -1) {
504 +                        sg_set_error_with_errno(SG_ERROR_PSTAT,
505 +                                                "pstat_static");
506 +                        return NULL;
507 +                }
508 +                got = 1;
509 +        }
510 +        return &pst;
511 + }
512 + #endif
513 +
514   int sg_init(){
515          sg_set_error(SG_ERROR_NONE, NULL);
516  
# Line 513 | Line 535 | int sg_init(){
535   }
536  
537   int sg_drop_privileges() {
538 + #ifdef HAVE_SETEGID
539          if (setegid(getgid()) != 0) {
540 <                sg_set_error(SG_ERROR_SETEGID, NULL);
540 > #elif defined(HAVE_SETRESGID)
541 >        if (setresgid(getgid(), getgid(), getgid()) != 0) {
542 > #else
543 >        {
544 > #endif
545 >                sg_set_error_with_errno(SG_ERROR_SETEGID, NULL);
546                  return -1;
547          }
548 + #ifdef HAVE_SETEUID
549          if (seteuid(getuid()) != 0) {
550 <                sg_set_error(SG_ERROR_SETEUID, NULL);
550 > #elif defined(HAVE_SETRESUID)
551 >        if (setresuid(getuid(), getuid(), getuid()) != 0) {
552 > #else
553 >        {
554 > #endif
555 >                sg_set_error_with_errno(SG_ERROR_SETEUID, NULL);
556                  return -1;
557          }
558          return 0;
# Line 528 | Line 562 | void *sg_realloc(void *ptr, size_t size) {
562          void *tmp = NULL;
563          tmp = realloc(ptr, size);
564          if(tmp == NULL) {
565 <                sg_set_error(SG_ERROR_MALLOC, NULL);
565 >                sg_set_error_with_errno(SG_ERROR_MALLOC, NULL);
566          }
567          return tmp;
568   }
535 –

Diff Legend

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