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.51 by tdb, Wed Apr 7 21:08:40 2004 UTC vs.
Revision 1.57 by tdb, Mon Nov 1 18:30:17 2004 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 266 | Line 265 | static int build_mapping(){
265
266		#endif
267
268	<
268	>	#if defined(LINUX) || defined(CYGWIN)
269		char *sg_f_read_line(FILE *f, const char *string){
270		/* Max line length. 8k should be more than enough */
271		static char line[8192];
#	Line 291 | Line 290 | char *sg_get_string_match(char *line, regmatch_t *matc
290		return match_string;
291		}
292
293	+	long long sg_get_ll_match(char *line, regmatch_t *match){
294	+	char *ptr;
295	+	long long num;
296
297	+	ptr=line+match->rm_so;
298	+	num=atoll(ptr);
299	+
300	+	return num;
301	+	}
302	+	#endif
303	+
304		#ifndef HAVE_ATOLL
305		static long long atoll(const char *s) {
306		long long value = 0;
#	Line 430 | Line 439 | int sg_update_string(char **dest, const char *src) {
439		return 0;
440		}
441
433	–	long long sg_get_ll_match(char *line, regmatch_t *match){
434	–	char *ptr;
435	–	long long num;
436	–
437	–	ptr=line+match->rm_so;
438	–	num=atoll(ptr);
439	–
440	–	return num;
441	–	}
442	–
442		#if (defined(FREEBSD) && !defined(FREEBSD5)) || defined(DFBSD)
443		kvm_t *sg_get_kvm() {
444		static kvm_t *kvmd = NULL;
#	Line 482 | Line 481 | struct uvmexp *sg_get_uvmexp() {
481		mib[1] = VM_UVMEXP;
482
483		if (sysctl(mib, 2, &uvm, &size, NULL, 0) < 0) {
484	<	sg_set_error(SG_ERROR_SYSCTL, "CTL_VM.VM_UVMEXP");
484	>	sg_set_error_with_errno(SG_ERROR_SYSCTL, "CTL_VM.VM_UVMEXP");
485		return NULL;
486		}
487
#	Line 491 | Line 490 | struct uvmexp *sg_get_uvmexp() {
490		#endif
491
492		int sg_init(){
493	+	sg_set_error(SG_ERROR_NONE, NULL);
494	+
495		#if (defined(FREEBSD) && !defined(FREEBSD5)) || defined(DFBSD)
496		if (sg_get_kvm() == NULL) {
497		return -1;
#	Line 512 | Line 513 | int sg_init(){
513		}
514
515		int sg_drop_privileges() {
516	+	#ifdef HAVE_SETEGID
517		if (setegid(getgid()) != 0) {
518	<	sg_set_error(SG_ERROR_SETEGID, NULL);
518	>	#elif defined(HAVE_SETRESGID)
519	>	if (setresgid(getgid(), getgid(), getgid()) != 0) {
520	>	#else
521	>	{
522	>	#endif
523	>	sg_set_error_with_errno(SG_ERROR_SETEGID, NULL);
524		return -1;
525		}
526	+	#ifdef HAVE_SETEUID
527		if (seteuid(getuid()) != 0) {
528	<	sg_set_error(SG_ERROR_SETEUID, NULL);
528	>	#elif defined(HAVE_SETRESUID)
529	>	if (setresuid(getuid(), getuid(), getuid()) != 0) {
530	>	#else
531	>	{
532	>	#endif
533	>	sg_set_error_with_errno(SG_ERROR_SETEUID, NULL);
534		return -1;
535		}
536		return 0;
#	Line 527 | Line 540 | void *sg_realloc(void *ptr, size_t size) {
540		void *tmp = NULL;
541		tmp = realloc(ptr, size);
542		if(tmp == NULL) {
543	<	sg_set_error(SG_ERROR_MALLOC, NULL);
543	>	sg_set_error_with_errno(SG_ERROR_MALLOC, NULL);
544		}
545		return tmp;
546		}
547
548	+	/* If we don't have a GNU compatible realloc, fake it. */
549	+	#if HAVE_REALLOC == 0
550	+	void *rpl_realloc(void *ptr, size_t size) {
551	+	if (ptr == NULL && size == 0) {
552	+	return NULL;
553	+	}
554	+
555	+	if (size == 0) {
556	+	free(ptr);
557	+	return NULL;
558	+	}
559	+
560	+	if (ptr == NULL) {
561	+	return malloc(size);
562	+	}
563	+
564	+	#undef realloc
565	+	return realloc(ptr, size);
566	+	#define realloc rpl_realloc
567	+	}
568	+	#endif

Diff Legend

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