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.48 by ats, Wed Apr 7 10:33:50 2004 UTC vs.
Revision 1.65 by tdb, Mon Jun 18 20:58:12 2007 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"
#	Line 61 | 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 155 | Line 161 | static char *read_dir(char *disk_path){
161		file_name[x] = '\0';
162		if (strcmp(file_name, temp_name) == 0) {
163		if (sg_update_string(&svr_name,
164	<	dp->d_name) < 0) {
164	>	dp->d_name) < 0) {
165		return NULL;
166		}
167		closedir(dirp);
#	Line 173 | Line 179 | static int get_alias(char *alias){
179		di_node_t root_node;
180		di_node_t node;
181		di_minor_t minor = DI_MINOR_NIL;
182	<	char tmpnode[MAXPATHLEN];
182	>	char tmpnode[MAXPATHLEN + 1];
183		char *phys_path;
184		char *minor_name;
185		char *value;
#	Line 187 | Line 193 | static int get_alias(char *alias){
193		instance = di_instance(node);
194		phys_path = di_devfs_path(node);
195		minor_name = di_minor_name(minor);
196	<	strcpy(tmpnode, alias);
196	>	sg_strlcpy(tmpnode, alias, MAXPATHLEN);
197		sprintf(tmpnode, "%s%d", tmpnode, instance);
198		sg_strlcpy(file, "/devices", sizeof file);
199		sg_strlcat(file, phys_path, sizeof file);
#	Line 231 | 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 243 | 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	+	kstat_close(kc);
253		return -1;
254		}
255		if( !strncmp(driver_list[x], device_name, BIG_ENOUGH)){
#	Line 253 | Line 260 | static int build_mapping(){
260
261		if(!found){
262		if((get_alias(device_name)) != 0){
263	+	kstat_close(kc);
264		return -1;
265		}
266		strncpy(driver_list[x], device_name, BIG_ENOUGH);
#	Line 261 | Line 269 | static int build_mapping(){
269		}
270		}
271
272	+	kstat_close(kc);
273	+
274		return 0;
275		}
276
277		#endif
278
279	<
270	<
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 278 | 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
#	Line 291 | Line 301 | char *sg_get_string_match(char *line, regmatch_t *matc
301		return match_string;
302		}
303
304	<
295	<
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 313 | Line 322 | static long long atoll(const char *s) {
322		}
323		#endif
324
325	<	/*      $OpenBSD: strlcpy.c,v 1.8 2003/06/17 21:56:24 millert Exp $     */
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.11 2006/05/05 15:27:38 millert Exp $    */
337	+
338		/*
339		* Copyright (c) 1998 Todd C. Miller <Todd.Miller@courtesan.com>
340		*
#	Line 337 | 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	>	char *d = dst;
361	>	const char *s = src;
362	>	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) {
366	>	while (--n != 0) {
367	>	if ((*d++ = *s++) == '\0')
368	>	break;
369	>	}
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 $    */
383	>	/*      $OpenBSD: strlcat.c,v 1.13 2005/08/08 08:05:37 espie Exp $      */
384
385		/*
386		* Copyright (c) 1998 Todd C. Miller <Todd.Miller@courtesan.com>
#	Line 386 | 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	>	char *d = dst;
410	>	const char *s = src;
411	>	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 426 | Line 446 | int sg_update_string(char **dest, const char *src) {
446		return -1;
447		}
448
449	<	strcpy(new, src);
449	>	sg_strlcpy(new, src, strlen(src) + 1);
450		*dest = new;
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	>	sg_strlcat(*dest, src, len);
466	>	return 0;
467		}
468
469		#if (defined(FREEBSD) && !defined(FREEBSD5)) || defined(DFBSD)
#	Line 450 | 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 462 | 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 477 | Line 508 | struct uvmexp *sg_get_uvmexp() {
508		mib[1] = VM_UVMEXP;
509
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
#	Line 484 | Line 516 | struct uvmexp *sg_get_uvmexp() {
516		}
517		#endif
518
519	+	#ifdef HPUX
520	+	struct pst_static *sg_get_pstat_static() {
521	+	static int got = 0;
522	+	static struct pst_static pst;
523	+
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;
#	Line 502 | 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
#	Line 515 | Line 604 | 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(SG_ERROR_MALLOC_FAILED, NULL);
607	>	sg_set_error_with_errno(SG_ERROR_MALLOC, NULL);
608		}
609		return tmp;
610		}
522	–

Diff Legend

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