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.20 by pajs, Fri Jan 9 16:37:08 2004 UTC vs.
Revision 1.46 by tdb, Wed Apr 7 09:44:08 2004 UTC

# Line 1 | Line 1
1 < /*
2 < * i-scream central monitoring system
1 > /*
2 > * i-scream libstatgrab
3   * http://www.i-scream.org
4 < * Copyright (C) 2000-2003 i-scream
4 > * Copyright (C) 2000-2004 i-scream
5   *
6 < * This program is free software; you can redistribute it and/or
7 < * modify it under the terms of the GNU General Public License
8 < * as published by the Free Software Foundation; either version 2
9 < * of the License, or (at your option) any later version.
6 > * This library is free software; you can redistribute it and/or
7 > * modify it under the terms of the GNU Lesser General Public
8 > * License as published by the Free Software Foundation; either
9 > * version 2.1 of the License, or (at your option) any later version.
10   *
11 < * This program is distributed in the hope that it will be useful,
11 > * This library is distributed in the hope that it will be useful,
12   * but WITHOUT ANY WARRANTY; without even the implied warranty of
13 < * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
14 < * GNU General Public License for more details.
13 > * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
14 > * Lesser General Public License for more details.
15   *
16 < * You should have received a copy of the GNU General Public License
17 < * along with this program; if not, write to the Free Software
18 < * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
16 > * You should have received a copy of the GNU Lesser General Public
17 > * License along with this library; if not, write to the Free Software
18 > * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
19 > * 02111-1307 USA
20 > *
21 > * $Id$
22   */
23  
24   #ifdef HAVE_CONFIG_H
# Line 30 | Line 33
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 + #include "statgrab.h"
49  
50   #ifdef SOLARIS
51 + #ifdef HAVE_LIBDEVINFO_H
52   #include <libdevinfo.h>
53 + #endif
54   #include <kstat.h>
55   #include <unistd.h>
56   #include <ctype.h>
# Line 51 | Line 62
62   #include <dirent.h>
63   #endif
64  
65 < #ifdef SOLARIS
65 > #if defined(SOLARIS) && defined(HAVE_LIBDEVINFO_H)
66   struct map{
67          char *bsd;
68          char *svr;
# Line 61 | Line 72 | struct map{
72   typedef struct map mapping_t;
73  
74   static mapping_t *mapping = NULL;
75 + #endif
76  
77 < char *get_svr_from_bsd(char *bsd){
77 > #ifdef SOLARIS
78 > const char *sg_get_svr_from_bsd(const char *bsd){
79 > #ifdef HAVE_LIBDEVINFO_H
80          mapping_t *map_ptr;
81          for(map_ptr = mapping; map_ptr != NULL; map_ptr = map_ptr->next)
82                  if(!strcmp(map_ptr->bsd, bsd)) return map_ptr->svr;
83 <
83 > #endif
84          return bsd;
85   }
86 + #endif
87  
88 < void add_mapping(char *bsd, char *svr){
88 > #if defined(SOLARIS) && defined(HAVE_LIBDEVINFO_H)
89 > static void add_mapping(char *bsd, char *svr){
90          mapping_t *map_ptr;
91          mapping_t *map_end_ptr;
92  
77        bsd = strdup(bsd);
78        svr = strdup(svr);
79
93          if (mapping == NULL){
94                  mapping = malloc(sizeof(mapping_t));
95                  if (mapping == NULL) return;
# Line 99 | Line 112 | void add_mapping(char *bsd, char *svr){
112          }
113  
114          map_ptr->next = NULL;
115 <        map_ptr->bsd = bsd;
116 <        map_ptr->svr = svr;
115 >        map_ptr->bsd = strdup(bsd);
116 >        map_ptr->svr = strdup(svr);
117  
118          return;
119   }
120  
121 < char *read_dir(char *disk_path){
121 >
122 > static char *read_dir(char *disk_path){
123          DIR *dirp;
124          struct dirent *dp;
125          struct stat stbuf;
# Line 147 | Line 161 | char *read_dir(char *disk_path){
161   }
162  
163  
164 <
151 < int get_alias(char *alias){
164 > static int get_alias(char *alias){
165          char file[MAXPATHLEN];
166          di_node_t root_node;
167          di_node_t node;
# Line 159 | Line 172 | int get_alias(char *alias){
172          char *value;
173          int instance;
174          if ((root_node = di_init("/", DINFOCPYALL)) == DI_NODE_NIL) {
175 <                return 1;
175 >                return -1;
176          }
177          node = di_drv_first_node(alias, root_node);
178          while (node != DI_NODE_NIL) {
# Line 169 | Line 182 | int get_alias(char *alias){
182                          minor_name = di_minor_name(minor);
183                          strcpy(tmpnode, alias);
184                          sprintf(tmpnode, "%s%d", tmpnode, instance);
185 <                        strlcpy(file, "/devices", sizeof file);
186 <                        strlcat(file, phys_path, sizeof file);
187 <                        strlcat(file, ":", sizeof file);
188 <                        strlcat(file, minor_name, sizeof file);
185 >                        sg_strlcpy(file, "/devices", sizeof file);
186 >                        sg_strlcat(file, phys_path, sizeof file);
187 >                        sg_strlcat(file, ":", sizeof file);
188 >                        sg_strlcat(file, minor_name, sizeof file);
189                          value = read_dir(file);
190                          if (value != NULL){
191                                  add_mapping(tmpnode, value);
# Line 187 | Line 200 | int get_alias(char *alias){
200          return 0;
201   }
202  
203 < int build_mapping(){
204 <        char device_name[512];
203 >
204 > #define BIG_ENOUGH 512
205 > static int build_mapping(){
206 >        char device_name[BIG_ENOUGH];
207          int x;
208          kstat_ctl_t *kc;
209          kstat_t *ksp;
210          kstat_io_t kios;
211  
212 +        char driver_list[BIG_ENOUGH][BIG_ENOUGH];
213 +        int list_entries = 0;
214 +        int found;
215 +
216          if ((kc = kstat_open()) == NULL) {
217 <                return;
217 >                return -1;
218          }
219  
220          for (ksp = kc->kc_chain; ksp; ksp = ksp->ks_next) {
# Line 210 | Line 229 | int build_mapping(){
229                          }
230                          if(x == sizeof device_name) x--;
231                          device_name[x] = '\0';
232 <                        if((get_alias(device_name)) != 0){
233 <                                return 1;
232 >
233 >                        /* Check if we've not already looked it up */
234 >                        found = 0;
235 >                        for(x=0;x<list_entries;x++){
236 >                                if (x>=BIG_ENOUGH){
237 >                                        /* We've got bigger than we thought was massive */
238 >                                        /* If we hit this.. Make big enough bigger */
239 >                                        return -1;
240 >                                }
241 >                                if( !strncmp(driver_list[x], device_name, BIG_ENOUGH)){
242 >                                        found = 1;
243 >                                        break;
244 >                                }
245                          }
246 +
247 +                        if(!found){
248 +                                if((get_alias(device_name)) != 0){
249 +                                        return -1;
250 +                                }
251 +                                strncpy(driver_list[x], device_name, BIG_ENOUGH);
252 +                                list_entries++;
253 +                        }
254                  }
255          }
256  
# Line 223 | Line 261 | int build_mapping(){
261  
262  
263  
264 < char *f_read_line(FILE *f, const char *string){
264 > char *sg_f_read_line(FILE *f, const char *string){
265          /* Max line length. 8k should be more than enough */
266          static char line[8192];
267  
# Line 236 | Line 274 | char *f_read_line(FILE *f, const char *string){
274          return NULL;
275   }
276  
277 < char *get_string_match(char *line, regmatch_t *match){
277 > char *sg_get_string_match(char *line, regmatch_t *match){
278          int len=match->rm_eo - match->rm_so;
279          char *match_string=malloc(len+1);
280  
# Line 268 | Line 306 | static long long atoll(const char *s) {
306   }
307   #endif
308  
309 < #ifndef HAVE_STRLCPY
272 < *      $OpenBSD: strlcpy.c,v 1.8 2003/06/17 21:56:24 millert Exp $     */
309 > /*      $OpenBSD: strlcpy.c,v 1.8 2003/06/17 21:56:24 millert Exp $     */
310  
311   /*
312   * Copyright (c) 1998 Todd C. Miller <Todd.Miller@courtesan.com>
# Line 292 | Line 329 | static long long atoll(const char *s) {
329   * will be copied.  Always NUL terminates (unless siz == 0).
330   * Returns strlen(src); if retval >= siz, truncation occurred.
331   */
332 < size_t strlcpy(char *dst, const char *src, size_t siz){
332 > size_t sg_strlcpy(char *dst, const char *src, size_t siz){
333          register char *d = dst;
334          register const char *s = src;
335          register size_t n = siz;
# Line 315 | Line 352 | size_t strlcpy(char *dst, const char *src, size_t siz)
352  
353          return(s - src - 1);    /* count does not include NUL */
354   }
318 #endif
355  
320 #ifndef HAVE_STRLCAT
356   /*      $OpenBSD: strlcat.c,v 1.11 2003/06/17 21:56:24 millert Exp $    */
357  
358   /*
# Line 343 | Line 378 | size_t strlcpy(char *dst, const char *src, size_t siz)
378   * Returns strlen(src) + MIN(siz, strlen(initial dst)).
379   * If retval >= siz, truncation occurred.
380   */
381 < size_t strlcat(char *dst, const char *src, size_t siz){
381 > size_t sg_strlcat(char *dst, const char *src, size_t siz){
382          register char *d = dst;
383          register const char *s = src;
384          register size_t n = siz;
# Line 369 | Line 404 | size_t strlcat(char *dst, const char *src, size_t siz)
404          return(dlen + (s - src));       /* count does not include NUL */
405   }
406  
407 < #endif
407 > int sg_update_string(char **dest, const char *src) {
408 >        char *new;
409  
410 < long long get_ll_match(char *line, regmatch_t *match){
410 >        if (src == NULL) {
411 >                /* We're being told to set it to NULL. */
412 >                free(*dest);
413 >                *dest = NULL;
414 >                return 0;
415 >        }
416 >
417 >        new = realloc(*dest, strlen(src) + 1);
418 >        if (new == NULL) {
419 >                return -1;
420 >        }
421 >
422 >        strcpy(new, src);
423 >        *dest = new;
424 >        return 0;
425 > }
426 >
427 > long long sg_get_ll_match(char *line, regmatch_t *match){
428          char *ptr;
429          long long num;
430  
# Line 381 | Line 434 | long long get_ll_match(char *line, regmatch_t *match){
434          return num;
435   }
436  
437 < #ifdef ALLBSD
438 < kvm_t *get_kvm() {
437 > #if (defined(FREEBSD) && !defined(FREEBSD5)) || defined(DFBSD)
438 > kvm_t *sg_get_kvm() {
439          static kvm_t *kvmd = NULL;
440  
441          if (kvmd != NULL) {
# Line 392 | Line 445 | kvm_t *get_kvm() {
445          kvmd = kvm_openfiles(NULL, NULL, NULL, O_RDONLY, NULL);
446          return kvmd;
447   }
395 #endif
448  
449 < #ifdef NETBSD
450 < struct uvmexp *get_uvmexp() {
451 <        static u_long addr = 0;
400 <        static struct uvmexp uvm;
401 <        kvm_t *kvmd = get_kvm();
449 > /* Can't think of a better name for this function */
450 > kvm_t *sg_get_kvm2() {
451 >        static kvm_t *kvmd2 = NULL;
452  
453 <        if (kvmd == NULL) {
454 <                return NULL;
453 >        if (kvmd2 != NULL) {
454 >                return kvmd2;
455          }
456  
457 <        if (addr == 0) {
458 <                struct nlist symbols[] = {
459 <                        { "_uvmexp" },
460 <                        { NULL }
411 <                };
457 >        kvmd2 = kvm_openfiles(_PATH_DEVNULL, _PATH_DEVNULL, NULL, O_RDONLY, NULL);
458 >        return kvmd2;
459 > }
460 > #endif
461  
462 <                if (kvm_nlist(kvmd, symbols) != 0) {
463 <                        return NULL;
464 <                }
465 <                addr = symbols[0].n_value;
466 <        }
462 > #if defined(NETBSD) || defined(OPENBSD)
463 > struct uvmexp *sg_get_uvmexp() {
464 >        int mib[2];
465 >        size_t size = sizeof(struct uvmexp);
466 >        static struct uvmexp uvm;
467 >        struct uvmexp *new;
468  
469 <        if (kvm_read(kvmd, addr, &uvm, sizeof uvm) != sizeof uvm) {
469 >        mib[0] = CTL_VM;
470 >        mib[1] = VM_UVMEXP;
471 >
472 >        if (sysctl(mib, 2, &uvm, &size, NULL, 0) < 0) {
473                  return NULL;
474          }
475 +
476          return &uvm;
477   }
478   #endif
479  
480 < int statgrab_init(){
481 < #ifdef ALLBSD
482 <        {
483 <                kvm_t *kvmd = get_kvm();
430 <                if (kvmd == NULL) return 1;
480 > int sg_init(){
481 > #if (defined(FREEBSD) && !defined(FREEBSD5)) || defined(DFBSD)
482 >        if (sg_get_kvm() == NULL) {
483 >                return -1;
484          }
485 < #endif
486 < #ifdef NETBSD
434 <        {
435 <                struct uvmexp *uvm = get_uvmexp();
436 <                if (uvm == NULL) return 1;
485 >        if (sg_get_kvm2() == NULL) {
486 >                return -1;
487          }
488   #endif
489   #ifdef SOLARIS
# Line 441 | Line 491 | int statgrab_init(){
491           * will still work, just no disk mappings. So we will ignore the exit
492           * status of this, and carry on merrily.
493           */
494 + #ifdef HAVE_LIBDEVINFO_H
495          build_mapping();
496   #endif
497 + #endif
498          return 0;
499   }
500  
501 < int statgrab_drop_privileges() {
501 > int sg_drop_privileges() {
502          if (setegid(getgid()) != 0) return -1;
503          if (seteuid(getuid()) != 0) return -1;
504          return 0;
505 + }
506 +
507 + void *sg_realloc(void *ptr, size_t size) {
508 +        void *tmp = NULL;
509 +        tmp = realloc(ptr, size);
510 +        if(tmp == NULL) {
511 +                sg_set_error(SG_ERROR_MALLOC_FAILED, NULL);
512 +        }
513 +        return tmp;
514   }
515  

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines