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.14 by pajs, Thu Nov 13 17:02:46 2003 UTC vs.
Revision 1.19 by pajs, Fri Jan 9 16:19:58 2004 UTC

# Line 25 | Line 25
25   #include <stdio.h>
26   #include <string.h>
27   #include <stdlib.h>
28 + #include <unistd.h>
29   #include <sys/types.h>
30   #include <regex.h>
31   #ifdef ALLBSD
# Line 77 | Line 78 | void add_mapping(char *bsd, char *svr){
78          svr = strdup(svr);
79  
80          if (mapping == NULL){
80                printf("New malloc\n");
81                  mapping = malloc(sizeof(mapping_t));
82                  if (mapping == NULL) return;
83                  map_ptr = mapping;
# Line 85 | Line 85 | void add_mapping(char *bsd, char *svr){
85                  /* See if its already been added */
86                  for(map_ptr = mapping; map_ptr != NULL; map_ptr = map_ptr->next){
87                          if( (!strcmp(map_ptr->bsd, bsd)) || (!strcmp(map_ptr->svr, svr)) ){
88                                printf("%s matches %s\n", map_ptr->bsd, bsd);
88                                  return;
89                          }
90                          map_end_ptr = map_ptr;
# Line 95 | Line 94 | void add_mapping(char *bsd, char *svr){
94                   * new mapping_t
95                   */
96                  map_end_ptr->next = malloc(sizeof(mapping_t));
98                printf("Second malloc\n");
97                  if (map_end_ptr->next == NULL) return;
98                  map_ptr = map_end_ptr->next;
99          }
100  
103        printf("Adding %s\n", bsd);
101          map_ptr->next = NULL;
102          map_ptr->bsd = bsd;
103          map_ptr->svr = svr;
# Line 110 | Line 107 | void add_mapping(char *bsd, char *svr){
107  
108   char *read_dir(char *disk_path){
109          DIR *dirp;
110 <        struct dirent *dp;
111 <        struct stat stbuf;
110 >        struct dirent *dp;
111 >        struct stat stbuf;
112          char *svr_name;
113 <        char current_dir[MAXPATHLEN];
114 <        char file_name[MAXPATHLEN];
115 <        char temp_name[MAXPATHLEN];
116 <        char dir_dname[MAXPATHLEN];
113 >        char current_dir[MAXPATHLEN];
114 >        char file_name[MAXPATHLEN];
115 >        char temp_name[MAXPATHLEN];
116 >        char dir_dname[MAXPATHLEN];
117          char *dsk_dir;
118          int x;
119  
120          dsk_dir = "/dev/osa/dev/dsk";
121 <        strncpy(current_dir, dsk_dir, sizeof current_dir);
122 <        if ((dirp = opendir(current_dir)) == NULL){
121 >        strncpy(current_dir, dsk_dir, sizeof current_dir);
122 >        if ((dirp = opendir(current_dir)) == NULL){
123                  dsk_dir = "/dev/dsk";
124                  snprintf(current_dir, sizeof current_dir, "%s", dsk_dir);
125                  if ((dirp = opendir(current_dir)) == NULL){
# Line 130 | Line 127 | char *read_dir(char *disk_path){
127                  }
128          }
129  
130 <        while ((dp = readdir(dirp)) != NULL){
130 >        while ((dp = readdir(dirp)) != NULL){
131                  snprintf(temp_name, sizeof temp_name, "../..%s", disk_path);
132                  snprintf(dir_dname, sizeof dir_dname, "%s/%s", dsk_dir, dp->d_name);
133                  stat(dir_dname,&stbuf);
# Line 144 | Line 141 | char *read_dir(char *disk_path){
141                                  return svr_name;
142                          }
143                  }
147                closedir(dirp);
144          }
145 +        closedir(dirp);
146          return NULL;
147   }
148  
# Line 162 | Line 159 | int get_alias(char *alias){
159          char *value;
160          int instance;
161          if ((root_node = di_init("/", DINFOCPYALL)) == DI_NODE_NIL) {
162 <                fprintf(stderr, "di_init() failed\n");
166 <                exit(1);
162 >                return 1;
163          }
164          node = di_drv_first_node(alias, root_node);
165          while (node != DI_NODE_NIL) {
# Line 173 | Line 169 | int get_alias(char *alias){
169                          minor_name = di_minor_name(minor);
170                          strcpy(tmpnode, alias);
171                          sprintf(tmpnode, "%s%d", tmpnode, instance);
172 <                        strcpy(file, "/devices");
173 <                        strcat(file, phys_path);
174 <                        strcat(file, ":");
175 <                        strcat(file, minor_name);
172 >                        strlcpy(file, "/devices", sizeof file);
173 >                        strlcat(file, phys_path, sizeof file);
174 >                        strlcat(file, ":", sizeof file);
175 >                        strlcat(file, minor_name, sizeof file);
176                          value = read_dir(file);
177                          if (value != NULL){
178                                  add_mapping(tmpnode, value);
# Line 186 | Line 182 | int get_alias(char *alias){
182                  }else{
183                          node = di_drv_next_node(node);
184                  }
185 <        }                           /* End of the while loop */
185 >        }
186          di_fini(root_node);
187 <        return (-1);
187 >        return 0;
188   }
189  
190 < void build_mapping(){
190 > int build_mapping(){
191          char device_name[512];
192          int x;
193 <        kstat_ctl_t *kc;
194 <        kstat_t *ksp;
195 <        kstat_io_t kios;
193 >        kstat_ctl_t *kc;
194 >        kstat_t *ksp;
195 >        kstat_io_t kios;
196  
197          if ((kc = kstat_open()) == NULL) {
198 <                return NULL;
199 <        }
198 >                return;
199 >        }
200  
201 <        for (ksp = kc->kc_chain; ksp; ksp = ksp->ks_next) {
202 <                if (!strcmp(ksp->ks_class, "disk")) {
203 <
204 <                        if(ksp->ks_type != KSTAT_TYPE_IO) continue;
205 <                        /* We dont want metadevices appearins as num_diskio */
206 <                        if(strcmp(ksp->ks_module, "md")==0) continue;
211 <                        if((kstat_read(kc, ksp, &kios))==-1) continue;
201 >        for (ksp = kc->kc_chain; ksp; ksp = ksp->ks_next) {
202 >                if (!strcmp(ksp->ks_class, "disk")) {
203 >                        if(ksp->ks_type != KSTAT_TYPE_IO) continue;
204 >                        /* We dont want metadevices appearing as num_diskio */
205 >                        if(strcmp(ksp->ks_module, "md")==0) continue;
206 >                        if((kstat_read(kc, ksp, &kios))==-1) continue;
207                          strncpy(device_name, ksp->ks_name, sizeof device_name);
208                          for(x=0;x<(sizeof device_name);x++){
209                                  if( isdigit((int)device_name[x]) ) break;
210                          }
211                          if(x == sizeof device_name) x--;
212                          device_name[x] = '\0';
213 <                        get_alias(device_name);
214 <                 }
213 >                        if((get_alias(device_name)) != 0){
214 >                                return 1;
215 >                        }
216 >                }
217          }
218 <        
219 <        return;
218 >
219 >        return 0;
220   }
221  
222   #endif
# Line 271 | Line 268 | static long long atoll(const char *s) {
268   }
269   #endif
270  
271 + #ifndef HAVE_STRLCPY
272 + *      $OpenBSD: strlcpy.c,v 1.8 2003/06/17 21:56:24 millert Exp $     */
273 +
274 + /*
275 + * Copyright (c) 1998 Todd C. Miller <Todd.Miller@courtesan.com>
276 + *
277 + * Permission to use, copy, modify, and distribute this software for any
278 + * purpose with or without fee is hereby granted, provided that the above
279 + * copyright notice and this permission notice appear in all copies.
280 + *
281 + * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
282 + * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
283 + * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
284 + * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
285 + * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
286 + * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
287 + * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
288 + */
289 +
290 + /*
291 + * Copy src to string dst of size siz.  At most siz-1 characters
292 + * will be copied.  Always NUL terminates (unless siz == 0).
293 + * Returns strlen(src); if retval >= siz, truncation occurred.
294 + */
295 + size_t strlcpy(char *dst, const char *src, size_t siz){
296 +        register char *d = dst;
297 +        register const char *s = src;
298 +        register size_t n = siz;
299 +
300 +        /* Copy as many bytes as will fit */
301 +        if (n != 0 && --n != 0) {
302 +                do {
303 +                        if ((*d++ = *s++) == 0)
304 +                                break;
305 +                } while (--n != 0);
306 +        }
307 +
308 +        /* Not enough room in dst, add NUL and traverse rest of src */
309 +        if (n == 0) {
310 +                if (siz != 0)
311 +                        *d = '\0';              /* NUL-terminate dst */
312 +                while (*s++)
313 +                        ;
314 +        }
315 +
316 +        return(s - src - 1);    /* count does not include NUL */
317 + }
318 + #endif
319 +
320 + #ifndef HAVE_STRLCAT
321 + /*      $OpenBSD: strlcat.c,v 1.11 2003/06/17 21:56:24 millert Exp $    */
322 +
323 + /*
324 + * Copyright (c) 1998 Todd C. Miller <Todd.Miller@courtesan.com>
325 + *
326 + * Permission to use, copy, modify, and distribute this software for any
327 + * purpose with or without fee is hereby granted, provided that the above
328 + * copyright notice and this permission notice appear in all copies.
329 + *
330 + * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
331 + * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
332 + * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
333 + * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
334 + * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
335 + * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
336 + * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
337 + */
338 +
339 + /*
340 + * Appends src to string dst of size siz (unlike strncat, siz is the
341 + * full size of dst, not space left).  At most siz-1 characters
342 + * will be copied.  Always NUL terminates (unless siz <= strlen(dst)).
343 + * Returns strlen(src) + MIN(siz, strlen(initial dst)).
344 + * If retval >= siz, truncation occurred.
345 + */
346 + size_t strlcat(char *dst, const char *src, size_t siz){
347 +        register char *d = dst;
348 +        register const char *s = src;
349 +        register size_t n = siz;
350 +        size_t dlen;
351 +
352 +        /* Find the end of dst and adjust bytes left but don't go past end */
353 +        while (n-- != 0 && *d != '\0')
354 +                d++;
355 +        dlen = d - dst;
356 +        n = siz - dlen;
357 +
358 +        if (n == 0)
359 +                return(dlen + strlen(s));
360 +        while (*s != '\0') {
361 +                if (n != 1) {
362 +                        *d++ = *s;
363 +                        n--;
364 +                }
365 +                s++;
366 +        }
367 +        *d = '\0';
368 +
369 +        return(dlen + (s - src));       /* count does not include NUL */
370 + }
371 +
372 + #endif
373 +
374   long long get_ll_match(char *line, regmatch_t *match){
375          char *ptr;
376          long long num;
# Line 327 | Line 427 | int statgrab_init(){
427   #ifdef ALLBSD
428          {
429                  kvm_t *kvmd = get_kvm();
430 <                if (kvmd == NULL) return 1;
430 >                if (kvmd == NULL) return 1;
431          }
432   #endif
433   #ifdef NETBSD
# Line 337 | Line 437 | int statgrab_init(){
437          }
438   #endif
439   #ifdef SOLARIS
440 <        build_mapping();
440 >        if((build_mapping()) != 0) return 1;
441   #endif
442          return 0;
443   }
444 +
445 + int statgrab_drop_privileges() {
446 +        if (setegid(getgid()) != 0) return -1;
447 +        if (seteuid(getuid()) != 0) return -1;
448 +        return 0;
449 + }
450 +

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines