ViewVC Help

View File | Revision Log | Show Annotations | Revision Graph | Root Listing

root/i-scream/projects/libstatgrab/src/libstatgrab/tools.c

Comparing projects/libstatgrab/src/libstatgrab/tools.c (file contents):
Revision 1.42 by ats, Mon Apr 5 18:10:11 2004 UTC vs.
Revision 1.61 by tdb, Sat Nov 6 23:54:12 2004 UTC

#	Line 1 | Line 1
1		/*
2	<	* i-scream central monitoring system
2	>	* i-scream libstatgrab
3		* http://www.i-scream.org
4		* Copyright (C) 2000-2004 i-scream
5		*
#	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 43 | 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"
52
53		#ifdef SOLARIS
54		#ifdef HAVE_LIBDEVINFO_H
#	Line 90 | Line 94 | static void add_mapping(char *bsd, char *svr){
94		mapping_t *map_end_ptr;
95
96		if (mapping == NULL){
97	<	mapping = malloc(sizeof(mapping_t));
97	>	mapping = sg_malloc(sizeof(mapping_t));
98		if (mapping == NULL) return;
99		map_ptr = mapping;
100		}else{
#	Line 105 | Line 109 | static void add_mapping(char *bsd, char *svr){
109		/* We've reached end of list and not found the entry.. So we need to malloc
110		* new mapping_t
111		*/
112	<	map_end_ptr->next = malloc(sizeof(mapping_t));
112	>	map_end_ptr->next = sg_malloc(sizeof(mapping_t));
113		if (map_end_ptr->next == NULL) return;
114		map_ptr = map_end_ptr->next;
115		}
116
117		map_ptr->next = NULL;
118	<	map_ptr->bsd = strdup(bsd);
119	<	map_ptr->svr = strdup(svr);
118	>	map_ptr->bsd = NULL;
119	>	map_ptr->svr = NULL;
120	>	if (sg_update_string(&map_ptr->bsd, bsd) < 0
121	>	|| sg_update_string(&map_ptr->svr, svr) < 0) {
122	>	return;
123	>	}
124
125		return;
126		}
#	Line 122 | Line 130 | static char *read_dir(char *disk_path){
130		DIR *dirp;
131		struct dirent *dp;
132		struct stat stbuf;
133	<	char *svr_name;
133	>	char *svr_name = NULL;
134		char current_dir[MAXPATHLEN];
135		char file_name[MAXPATHLEN];
136		char temp_name[MAXPATHLEN];
#	Line 149 | Line 157 | static char *read_dir(char *disk_path){
157		x = readlink(dir_dname, file_name, sizeof(file_name));
158		file_name[x] = '\0';
159		if (strcmp(file_name, temp_name) == 0) {
160	<	svr_name = strdup(dp->d_name);
160	>	if (sg_update_string(&svr_name,
161	>	dp->d_name) < 0) {
162	>	return NULL;
163	>	}
164		closedir(dirp);
165		return svr_name;
166		}
#	Line 171 | Line 182 | static int get_alias(char *alias){
182		char *value;
183		int instance;
184		if ((root_node = di_init("/", DINFOCPYALL)) == DI_NODE_NIL) {
185	<	return 1;
185	>	return -1;
186		}
187		node = di_drv_first_node(alias, root_node);
188		while (node != DI_NODE_NIL) {
#	Line 213 | Line 224 | static int build_mapping(){
224		int found;
225
226		if ((kc = kstat_open()) == NULL) {
227	<	return 1;
227	>	return -1;
228		}
229
230		for (ksp = kc->kc_chain; ksp; ksp = ksp->ks_next) {
#	Line 223 | Line 234 | static int build_mapping(){
234		if(strcmp(ksp->ks_module, "md")==0) continue;
235		if((kstat_read(kc, ksp, &kios))==-1) continue;
236		strncpy(device_name, ksp->ks_name, sizeof device_name);
237	<	for(x=0;x<(sizeof device_name);x++){
237	>	for(x=0;x<(int)(sizeof device_name);x++){
238		if( isdigit((int)device_name[x]) ) break;
239		}
240		if(x == sizeof device_name) x--;
#	Line 235 | Line 246 | static int build_mapping(){
246		if (x>=BIG_ENOUGH){
247		/* We've got bigger than we thought was massive */
248		/* If we hit this.. Make big enough bigger */
249	<	return 1;
249	>	return -1;
250		}
251		if( !strncmp(driver_list[x], device_name, BIG_ENOUGH)){
252		found = 1;
#	Line 245 | Line 256 | static int build_mapping(){
256
257		if(!found){
258		if((get_alias(device_name)) != 0){
259	<	return 1;
259	>	return -1;
260		}
261		strncpy(driver_list[x], device_name, BIG_ENOUGH);
262		list_entries++;
#	Line 258 | Line 269 | static int build_mapping(){
269
270		#endif
271
272	<
262	<
272	>	#if defined(LINUX) || defined(CYGWIN)
273		char *sg_f_read_line(FILE *f, const char *string){
274		/* Max line length. 8k should be more than enough */
275		static char line[8192];
#	Line 270 | Line 280 | char *sg_f_read_line(FILE *f, const char *string){
280		}
281		}
282
283	+	sg_set_error(SG_ERROR_PARSE, NULL);
284		return NULL;
285		}
286
287		char *sg_get_string_match(char *line, regmatch_t *match){
288		int len=match->rm_eo - match->rm_so;
289	<	char *match_string=malloc(len+1);
289	>	char *match_string=sg_malloc(len+1);
290
291		match_string=strncpy(match_string, line+match->rm_so, len);
292		match_string[len]='\0';
#	Line 283 | Line 294 | char *sg_get_string_match(char *line, regmatch_t *matc
294		return match_string;
295		}
296
297	<
287	<
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 305 | 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 329 | Line 350 | static long long atoll(const char *s) {
350		* Returns strlen(src); if retval >= siz, truncation occurred.
351		*/
352		size_t sg_strlcpy(char *dst, const char *src, size_t siz){
353	<	register char *d = dst;
354	<	register const char *s = src;
355	<	register size_t n = siz;
353	>	register char *d = dst;
354	>	register const char *s = src;
355	>	register size_t n = siz;
356
357	<	/* Copy as many bytes as will fit */
358	<	if (n != 0 && --n != 0) {
359	<	do {
360	<	if ((*d++ = *s++) == 0)
361	<	break;
362	<	} while (--n != 0);
363	<	}
357	>	/* Copy as many bytes as will fit */
358	>	if (n != 0 && --n != 0) {
359	>	do {
360	>	if ((*d++ = *s++) == 0)
361	>	break;
362	>	} while (--n != 0);
363	>	}
364
365	<	/* Not enough room in dst, add NUL and traverse rest of src */
366	<	if (n == 0) {
367	<	if (siz != 0)
368	<	*d = '\0';              /* NUL-terminate dst */
369	<	while (*s++)
370	<	;
371	<	}
365	>	/* Not enough room in dst, add NUL and traverse rest of src */
366	>	if (n == 0) {
367	>	if (siz != 0)
368	>	*d = '\0';            /* NUL-terminate dst */
369	>	while (*s++)
370	>	;
371	>	}
372
373	<	return(s - src - 1);    /* count does not include NUL */
373	>	return(s - src - 1);    /* count does not include NUL */
374		}
375
376		/*      $OpenBSD: strlcat.c,v 1.11 2003/06/17 21:56:24 millert Exp $    */
#	Line 378 | Line 399 | size_t sg_strlcpy(char *dst, const char *src, size_t s
399		* If retval >= siz, truncation occurred.
400		*/
401		size_t sg_strlcat(char *dst, const char *src, size_t siz){
402	<	register char *d = dst;
403	<	register const char *s = src;
404	<	register size_t n = siz;
405	<	size_t dlen;
402	>	register char *d = dst;
403	>	register const char *s = src;
404	>	register size_t n = siz;
405	>	size_t dlen;
406
407	<	/* Find the end of dst and adjust bytes left but don't go past end */
408	<	while (n-- != 0 && *d != '\0')
409	<	d++;
410	<	dlen = d - dst;
411	<	n = siz - dlen;
407	>	/* Find the end of dst and adjust bytes left but don't go past end */
408	>	while (n-- != 0 && *d != '\0')
409	>	d++;
410	>	dlen = d - dst;
411	>	n = siz - dlen;
412
413	<	if (n == 0)
414	<	return(dlen + strlen(s));
415	<	while (*s != '\0') {
416	<	if (n != 1) {
417	<	*d++ = *s;
418	<	n--;
419	<	}
420	<	s++;
421	<	}
422	<	*d = '\0';
413	>	if (n == 0)
414	>	return(dlen + strlen(s));
415	>	while (*s != '\0') {
416	>	if (n != 1) {
417	>	*d++ = *s;
418	>	n--;
419	>	}
420	>	s++;
421	>	}
422	>	*d = '\0';
423
424	<	return(dlen + (s - src));       /* count does not include NUL */
424	>	return(dlen + (s - src));       /* count does not include NUL */
425		}
426
427		int sg_update_string(char **dest, const char *src) {
#	Line 413 | Line 434 | int sg_update_string(char **dest, const char *src) {
434		return 0;
435		}
436
437	<	new = realloc(*dest, strlen(src) + 1);
437	>	new = sg_realloc(*dest, strlen(src) + 1);
438		if (new == NULL) {
439		return -1;
440		}
#	Line 423 | Line 444 | int sg_update_string(char **dest, const char *src) {
444		return 0;
445		}
446
426	–	long long sg_get_ll_match(char *line, regmatch_t *match){
427	–	char *ptr;
428	–	long long num;
429	–
430	–	ptr=line+match->rm_so;
431	–	num=atoll(ptr);
432	–
433	–	return num;
434	–	}
435	–
447		#if (defined(FREEBSD) && !defined(FREEBSD5)) || defined(DFBSD)
448		kvm_t *sg_get_kvm() {
449		static kvm_t *kvmd = NULL;
#	Line 442 | Line 453 | kvm_t *sg_get_kvm() {
453		}
454
455		kvmd = kvm_openfiles(NULL, NULL, NULL, O_RDONLY, NULL);
456	+	if(kvmd == NULL) {
457	+	sg_set_error(SG_ERROR_KVM_OPENFILES, NULL);
458	+	}
459		return kvmd;
460		}
461
#	Line 454 | Line 468 | kvm_t *sg_get_kvm2() {
468		}
469
470		kvmd2 = kvm_openfiles(_PATH_DEVNULL, _PATH_DEVNULL, NULL, O_RDONLY, NULL);
471	+	if(kvmd2 == NULL) {
472	+	sg_set_error(SG_ERROR_KVM_OPENFILES, NULL);
473	+	}
474		return kvmd2;
475		}
476		#endif
#	Line 461 | Line 478 | kvm_t *sg_get_kvm2() {
478		#if defined(NETBSD) || defined(OPENBSD)
479		struct uvmexp *sg_get_uvmexp() {
480		int mib[2];
481	<	size_t size;
482	<	static struct uvmexp *uvm = NULL;
481	>	size_t size = sizeof(struct uvmexp);
482	>	static struct uvmexp uvm;
483		struct uvmexp *new;
484
485		mib[0] = CTL_VM;
486		mib[1] = VM_UVMEXP;
487
488	<	if (sysctl(mib, 2, NULL, &size, NULL, 0) < 0) {
488	>	if (sysctl(mib, 2, &uvm, &size, NULL, 0) < 0) {
489	>	sg_set_error_with_errno(SG_ERROR_SYSCTL, "CTL_VM.VM_UVMEXP");
490		return NULL;
491		}
492
493	<	new = realloc(uvm, size);
494	<	if (new == NULL) {
495	<	return NULL;
478	<	}
479	<	uvm = new;
493	>	return &uvm;
494	>	}
495	>	#endif
496
497	<	if (sysctl(mib, 2, uvm, &size, NULL, 0) < 0) {
498	<	return NULL;
499	<	}
497	>	#ifdef HPUX
498	>	struct pst_static *sg_get_pstat_static() {
499	>	static int got = 0;
500	>	static struct pst_static pst;
501
502	<	return uvm;
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	+
517		#if (defined(FREEBSD) && !defined(FREEBSD5)) || defined(DFBSD)
518		if (sg_get_kvm() == NULL) {
519	<	return 1;
519	>	return -1;
520		}
521		if (sg_get_kvm2() == NULL) {
522	<	return 1;
522	>	return -1;
523		}
524		#endif
498	–	#if defined(NETBSD) || defined(OPENBSD)
499	–	/* This should always succeed, but it seems that on some
500	–	* versions of NetBSD the first call to get_uvmexp will return
501	–	* a non-filled-in structure; this is a workaround for that.
502	–	*/
503	–	if (sg_get_uvmexp() == NULL) return 1;
504	–	#endif
525		#ifdef SOLARIS
526		/* On solaris 7, this will fail if you are not root. But, everything
527		* will still work, just no disk mappings. So we will ignore the exit
#	Line 515 | Line 535 | int sg_init(){
535		}
536
537		int sg_drop_privileges() {
538	<	if (setegid(getgid()) != 0) return -1;
539	<	if (seteuid(getuid()) != 0) return -1;
538	>	#ifdef HAVE_SETEGID
539	>	if (setegid(getgid()) != 0) {
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	>	#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;
559		}
560
561	+	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_with_errno(SG_ERROR_MALLOC, NULL);
566	+	}
567	+	return tmp;
568	+	}

Diff Legend

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