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.43 by tdb, Tue Apr 6 14:52:58 2004 UTC vs.
Revision 1.64 by tdb, Mon Oct 9 14:09:38 2006 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 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 60 | Line 64
64		#include <sys/fcntl.h>
65		#include <dirent.h>
66		#endif
67	+	#ifdef WIN32
68	+	#include "win32.h"
69	+	#endif
70
71		#if defined(SOLARIS) && defined(HAVE_LIBDEVINFO_H)
72		struct map{
#	Line 90 | Line 97 | static void add_mapping(char *bsd, char *svr){
97		mapping_t *map_end_ptr;
98
99		if (mapping == NULL){
100	<	mapping = malloc(sizeof(mapping_t));
100	>	mapping = sg_malloc(sizeof(mapping_t));
101		if (mapping == NULL) return;
102		map_ptr = mapping;
103		}else{
#	Line 105 | Line 112 | static void add_mapping(char *bsd, char *svr){
112		/* We've reached end of list and not found the entry.. So we need to malloc
113		* new mapping_t
114		*/
115	<	map_end_ptr->next = malloc(sizeof(mapping_t));
115	>	map_end_ptr->next = sg_malloc(sizeof(mapping_t));
116		if (map_end_ptr->next == NULL) return;
117		map_ptr = map_end_ptr->next;
118		}
119
120		map_ptr->next = NULL;
121	<	map_ptr->bsd = strdup(bsd);
122	<	map_ptr->svr = strdup(svr);
121	>	map_ptr->bsd = NULL;
122	>	map_ptr->svr = NULL;
123	>	if (sg_update_string(&map_ptr->bsd, bsd) < 0
124	>	|| sg_update_string(&map_ptr->svr, svr) < 0) {
125	>	return;
126	>	}
127
128		return;
129		}
#	Line 122 | Line 133 | static char *read_dir(char *disk_path){
133		DIR *dirp;
134		struct dirent *dp;
135		struct stat stbuf;
136	<	char *svr_name;
136	>	char *svr_name = NULL;
137		char current_dir[MAXPATHLEN];
138		char file_name[MAXPATHLEN];
139		char temp_name[MAXPATHLEN];
#	Line 149 | Line 160 | static char *read_dir(char *disk_path){
160		x = readlink(dir_dname, file_name, sizeof(file_name));
161		file_name[x] = '\0';
162		if (strcmp(file_name, temp_name) == 0) {
163	<	svr_name = strdup(dp->d_name);
163	>	if (sg_update_string(&svr_name,
164	>	dp->d_name) < 0) {
165	>	return NULL;
166	>	}
167		closedir(dirp);
168		return svr_name;
169		}
#	Line 171 | Line 185 | static int get_alias(char *alias){
185		char *value;
186		int instance;
187		if ((root_node = di_init("/", DINFOCPYALL)) == DI_NODE_NIL) {
188	<	return 1;
188	>	return -1;
189		}
190		node = di_drv_first_node(alias, root_node);
191		while (node != DI_NODE_NIL) {
#	Line 213 | Line 227 | static int build_mapping(){
227		int found;
228
229		if ((kc = kstat_open()) == NULL) {
230	<	return 1;
230	>	return -1;
231		}
232
233		for (ksp = kc->kc_chain; ksp; ksp = ksp->ks_next) {
#	Line 223 | Line 237 | static int build_mapping(){
237		if(strcmp(ksp->ks_module, "md")==0) continue;
238		if((kstat_read(kc, ksp, &kios))==-1) continue;
239		strncpy(device_name, ksp->ks_name, sizeof device_name);
240	<	for(x=0;x<(sizeof device_name);x++){
240	>	for(x=0;x<(int)(sizeof device_name);x++){
241		if( isdigit((int)device_name[x]) ) break;
242		}
243		if(x == sizeof device_name) x--;
#	Line 235 | Line 249 | static int build_mapping(){
249		if (x>=BIG_ENOUGH){
250		/* We've got bigger than we thought was massive */
251		/* If we hit this.. Make big enough bigger */
252	<	return 1;
252	>	kstat_close(kc);
253	>	return -1;
254		}
255		if( !strncmp(driver_list[x], device_name, BIG_ENOUGH)){
256		found = 1;
#	Line 245 | Line 260 | static int build_mapping(){
260
261		if(!found){
262		if((get_alias(device_name)) != 0){
263	<	return 1;
263	>	kstat_close(kc);
264	>	return -1;
265		}
266		strncpy(driver_list[x], device_name, BIG_ENOUGH);
267		list_entries++;
#	Line 253 | Line 269 | static int build_mapping(){
269		}
270		}
271
272	+	kstat_close(kc);
273	+
274		return 0;
275		}
276
277		#endif
278
279	<
262	<
279	>	#if defined(LINUX) || defined(CYGWIN)
280		char *sg_f_read_line(FILE *f, const char *string){
281		/* Max line length. 8k should be more than enough */
282		static char line[8192];
#	Line 270 | Line 287 | char *sg_f_read_line(FILE *f, const char *string){
287		}
288		}
289
290	+	sg_set_error(SG_ERROR_PARSE, NULL);
291		return NULL;
292		}
293
294		char *sg_get_string_match(char *line, regmatch_t *match){
295		int len=match->rm_eo - match->rm_so;
296	<	char *match_string=malloc(len+1);
296	>	char *match_string=sg_malloc(len+1);
297
298		match_string=strncpy(match_string, line+match->rm_so, len);
299		match_string[len]='\0';
#	Line 283 | Line 301 | char *sg_get_string_match(char *line, regmatch_t *matc
301		return match_string;
302		}
303
304	<
287	<
304	>	/* Cygwin (without a recent newlib) doesn't have atoll */
305		#ifndef HAVE_ATOLL
306		static long long atoll(const char *s) {
307		long long value = 0;
#	Line 305 | Line 322 | static long long atoll(const char *s) {
322		}
323		#endif
324
325	+	long long sg_get_ll_match(char *line, regmatch_t *match){
326	+	char *ptr;
327	+	long long num;
328	+
329	+	ptr=line+match->rm_so;
330	+	num=atoll(ptr);
331	+
332	+	return num;
333	+	}
334	+	#endif
335	+
336		/*      $OpenBSD: strlcpy.c,v 1.8 2003/06/17 21:56:24 millert Exp $     */
337
338		/*
#	Line 329 | Line 357 | static long long atoll(const char *s) {
357		* Returns strlen(src); if retval >= siz, truncation occurred.
358		*/
359		size_t sg_strlcpy(char *dst, const char *src, size_t siz){
360	<	register char *d = dst;
361	<	register const char *s = src;
362	<	register size_t n = siz;
360	>	register char *d = dst;
361	>	register const char *s = src;
362	>	register size_t n = siz;
363
364	<	/* Copy as many bytes as will fit */
365	<	if (n != 0 && --n != 0) {
366	<	do {
367	<	if ((*d++ = *s++) == 0)
368	<	break;
369	<	} while (--n != 0);
370	<	}
364	>	/* Copy as many bytes as will fit */
365	>	if (n != 0 && --n != 0) {
366	>	do {
367	>	if ((*d++ = *s++) == 0)
368	>	break;
369	>	} while (--n != 0);
370	>	}
371
372	<	/* Not enough room in dst, add NUL and traverse rest of src */
373	<	if (n == 0) {
374	<	if (siz != 0)
375	<	*d = '\0';              /* NUL-terminate dst */
376	<	while (*s++)
377	<	;
378	<	}
372	>	/* Not enough room in dst, add NUL and traverse rest of src */
373	>	if (n == 0) {
374	>	if (siz != 0)
375	>	*d = '\0';            /* NUL-terminate dst */
376	>	while (*s++)
377	>	;
378	>	}
379
380	<	return(s - src - 1);    /* count does not include NUL */
380	>	return(s - src - 1);    /* count does not include NUL */
381		}
382
383		/*      $OpenBSD: strlcat.c,v 1.11 2003/06/17 21:56:24 millert Exp $    */
#	Line 378 | Line 406 | size_t sg_strlcpy(char *dst, const char *src, size_t s
406		* If retval >= siz, truncation occurred.
407		*/
408		size_t sg_strlcat(char *dst, const char *src, size_t siz){
409	<	register char *d = dst;
410	<	register const char *s = src;
411	<	register size_t n = siz;
412	<	size_t dlen;
409	>	register char *d = dst;
410	>	register const char *s = src;
411	>	register size_t n = siz;
412	>	size_t dlen;
413
414	<	/* Find the end of dst and adjust bytes left but don't go past end */
415	<	while (n-- != 0 && *d != '\0')
416	<	d++;
417	<	dlen = d - dst;
418	<	n = siz - dlen;
414	>	/* Find the end of dst and adjust bytes left but don't go past end */
415	>	while (n-- != 0 && *d != '\0')
416	>	d++;
417	>	dlen = d - dst;
418	>	n = siz - dlen;
419
420	<	if (n == 0)
421	<	return(dlen + strlen(s));
422	<	while (*s != '\0') {
423	<	if (n != 1) {
424	<	*d++ = *s;
425	<	n--;
426	<	}
427	<	s++;
428	<	}
429	<	*d = '\0';
420	>	if (n == 0)
421	>	return(dlen + strlen(s));
422	>	while (*s != '\0') {
423	>	if (n != 1) {
424	>	*d++ = *s;
425	>	n--;
426	>	}
427	>	s++;
428	>	}
429	>	*d = '\0';
430
431	<	return(dlen + (s - src));       /* count does not include NUL */
431	>	return(dlen + (s - src));       /* count does not include NUL */
432		}
433
434		int sg_update_string(char **dest, const char *src) {
#	Line 413 | Line 441 | int sg_update_string(char **dest, const char *src) {
441		return 0;
442		}
443
444	<	new = realloc(*dest, strlen(src) + 1);
444	>	new = sg_realloc(*dest, strlen(src) + 1);
445		if (new == NULL) {
446		return -1;
447		}
#	Line 423 | Line 451 | int sg_update_string(char **dest, const char *src) {
451		return 0;
452		}
453
454	<	long long sg_get_ll_match(char *line, regmatch_t *match){
455	<	char *ptr;
456	<	long long num;
454	>	/* join two strings together */
455	>	int sg_concat_string(char **dest, const char *src) {
456	>	char *new;
457	>	int len = strlen(*dest) + strlen(src) + 1;
458
459	<	ptr=line+match->rm_so;
460	<	num=atoll(ptr);
459	>	new = sg_realloc(*dest, len);
460	>	if (new == NULL) {
461	>	return -1;
462	>	}
463
464	<	return num;
464	>	*dest = new;
465	>	strcat(*dest, src);
466	>	return 0;
467		}
468
469		#if (defined(FREEBSD) && !defined(FREEBSD5)) || defined(DFBSD)
#	Line 442 | Line 475 | kvm_t *sg_get_kvm() {
475		}
476
477		kvmd = kvm_openfiles(NULL, NULL, NULL, O_RDONLY, NULL);
478	+	if(kvmd == NULL) {
479	+	sg_set_error(SG_ERROR_KVM_OPENFILES, NULL);
480	+	}
481		return kvmd;
482		}
483
#	Line 454 | Line 490 | kvm_t *sg_get_kvm2() {
490		}
491
492		kvmd2 = kvm_openfiles(_PATH_DEVNULL, _PATH_DEVNULL, NULL, O_RDONLY, NULL);
493	+	if(kvmd2 == NULL) {
494	+	sg_set_error(SG_ERROR_KVM_OPENFILES, NULL);
495	+	}
496		return kvmd2;
497		}
498		#endif
#	Line 461 | Line 500 | kvm_t *sg_get_kvm2() {
500		#if defined(NETBSD) || defined(OPENBSD)
501		struct uvmexp *sg_get_uvmexp() {
502		int mib[2];
503	<	size_t size;
504	<	static struct uvmexp *uvm = NULL;
503	>	size_t size = sizeof(struct uvmexp);
504	>	static struct uvmexp uvm;
505		struct uvmexp *new;
506
507		mib[0] = CTL_VM;
508		mib[1] = VM_UVMEXP;
509
510	<	if (sysctl(mib, 2, NULL, &size, NULL, 0) < 0) {
510	>	if (sysctl(mib, 2, &uvm, &size, NULL, 0) < 0) {
511	>	sg_set_error_with_errno(SG_ERROR_SYSCTL, "CTL_VM.VM_UVMEXP");
512		return NULL;
513		}
514
515	<	new = realloc(uvm, size);
516	<	if (new == NULL) {
517	<	return NULL;
478	<	}
479	<	uvm = new;
515	>	return &uvm;
516	>	}
517	>	#endif
518
519	<	if (sysctl(mib, 2, uvm, &size, NULL, 0) < 0) {
520	<	return NULL;
521	<	}
519	>	#ifdef HPUX
520	>	struct pst_static *sg_get_pstat_static() {
521	>	static int got = 0;
522	>	static struct pst_static pst;
523
524	<	return uvm;
524	>	if (!got) {
525	>	if (pstat_getstatic(&pst, sizeof pst, 1, 0) == -1) {
526	>	sg_set_error_with_errno(SG_ERROR_PSTAT,
527	>	"pstat_static");
528	>	return NULL;
529	>	}
530	>	got = 1;
531	>	}
532	>	return &pst;
533		}
534		#endif
535
536		int sg_init(){
537	+	sg_set_error(SG_ERROR_NONE, NULL);
538	+
539		#if (defined(FREEBSD) && !defined(FREEBSD5)) || defined(DFBSD)
540		if (sg_get_kvm() == NULL) {
541	<	return 1;
541	>	return -1;
542		}
543		if (sg_get_kvm2() == NULL) {
544	<	return 1;
544	>	return -1;
545		}
546		#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
547		#ifdef SOLARIS
548		/* On solaris 7, this will fail if you are not root. But, everything
549		* will still work, just no disk mappings. So we will ignore the exit
#	Line 511 | Line 553 | int sg_init(){
553		build_mapping();
554		#endif
555		#endif
556	+	#ifdef WIN32
557	+	return sg_win32_start_capture();
558	+	#endif
559		return 0;
560		}
561
562	+	int sg_shutdown() {
563	+	#ifdef WIN32
564	+	sg_win32_end_capture();
565	+	#endif
566	+	return 0;
567	+	}
568	+
569	+	int sg_snapshot() {
570	+	#ifdef WIN32
571	+	return sg_win32_snapshot();
572	+	#else
573	+	return 0;
574	+	#endif
575	+	}
576	+
577		int sg_drop_privileges() {
578	<	if (setegid(getgid()) != 0) return -1;
579	<	if (seteuid(getuid()) != 0) return -1;
578	>	#ifndef WIN32
579	>	#ifdef HAVE_SETEGID
580	>	if (setegid(getgid()) != 0) {
581	>	#elif defined(HAVE_SETRESGID)
582	>	if (setresgid(getgid(), getgid(), getgid()) != 0) {
583	>	#else
584	>	{
585	>	#endif
586	>	sg_set_error_with_errno(SG_ERROR_SETEGID, NULL);
587	>	return -1;
588	>	}
589	>	#ifdef HAVE_SETEUID
590	>	if (seteuid(getuid()) != 0) {
591	>	#elif defined(HAVE_SETRESUID)
592	>	if (setresuid(getuid(), getuid(), getuid()) != 0) {
593	>	#else
594	>	{
595	>	#endif
596	>	sg_set_error_with_errno(SG_ERROR_SETEUID, NULL);
597	>	return -1;
598	>	}
599	>	#endif /* WIN32 */
600		return 0;
601		}
602
603	+	void *sg_realloc(void *ptr, size_t size) {
604	+	void *tmp = NULL;
605	+	tmp = realloc(ptr, size);
606	+	if(tmp == NULL) {
607	+	sg_set_error_with_errno(SG_ERROR_MALLOC, NULL);
608	+	}
609	+	return tmp;
610	+	}

Diff Legend

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