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.51 by tdb, Wed Apr 7 21:08:40 2004 UTC

#	Line 155 | Line 155 | static char *read_dir(char *disk_path){
155		file_name[x] = '\0';
156		if (strcmp(file_name, temp_name) == 0) {
157		if (sg_update_string(&svr_name,
158	<	dp->d_name) < 0) {
158	>	dp->d_name) < 0) {
159		return NULL;
160		}
161		closedir(dirp);
#	Line 267 | Line 267 | static int build_mapping(){
267		#endif
268
269
270	–
270		char *sg_f_read_line(FILE *f, const char *string){
271		/* Max line length. 8k should be more than enough */
272		static char line[8192];
#	Line 278 | Line 277 | char *sg_f_read_line(FILE *f, const char *string){
277		}
278		}
279
280	+	sg_set_error(SG_ERROR_PARSE, NULL);
281		return NULL;
282		}
283
#	Line 292 | Line 292 | char *sg_get_string_match(char *line, regmatch_t *matc
292		}
293
294
295	–
295		#ifndef HAVE_ATOLL
296		static long long atoll(const char *s) {
297		long long value = 0;
#	Line 337 | Line 336 | static long long atoll(const char *s) {
336		* Returns strlen(src); if retval >= siz, truncation occurred.
337		*/
338		size_t sg_strlcpy(char *dst, const char *src, size_t siz){
339	<	register char *d = dst;
340	<	register const char *s = src;
341	<	register size_t n = siz;
339	>	register char *d = dst;
340	>	register const char *s = src;
341	>	register size_t n = siz;
342
343	<	/* Copy as many bytes as will fit */
344	<	if (n != 0 && --n != 0) {
345	<	do {
346	<	if ((*d++ = *s++) == 0)
347	<	break;
348	<	} while (--n != 0);
349	<	}
343	>	/* Copy as many bytes as will fit */
344	>	if (n != 0 && --n != 0) {
345	>	do {
346	>	if ((*d++ = *s++) == 0)
347	>	break;
348	>	} while (--n != 0);
349	>	}
350
351	<	/* Not enough room in dst, add NUL and traverse rest of src */
352	<	if (n == 0) {
353	<	if (siz != 0)
354	<	*d = '\0';              /* NUL-terminate dst */
355	<	while (*s++)
356	<	;
357	<	}
351	>	/* Not enough room in dst, add NUL and traverse rest of src */
352	>	if (n == 0) {
353	>	if (siz != 0)
354	>	*d = '\0';            /* NUL-terminate dst */
355	>	while (*s++)
356	>	;
357	>	}
358
359	<	return(s - src - 1);    /* count does not include NUL */
359	>	return(s - src - 1);    /* count does not include NUL */
360		}
361
362		/*      $OpenBSD: strlcat.c,v 1.11 2003/06/17 21:56:24 millert Exp $    */
#	Line 386 | Line 385 | size_t sg_strlcpy(char *dst, const char *src, size_t s
385		* If retval >= siz, truncation occurred.
386		*/
387		size_t sg_strlcat(char *dst, const char *src, size_t siz){
388	<	register char *d = dst;
389	<	register const char *s = src;
390	<	register size_t n = siz;
391	<	size_t dlen;
388	>	register char *d = dst;
389	>	register const char *s = src;
390	>	register size_t n = siz;
391	>	size_t dlen;
392
393	<	/* Find the end of dst and adjust bytes left but don't go past end */
394	<	while (n-- != 0 && *d != '\0')
395	<	d++;
396	<	dlen = d - dst;
397	<	n = siz - dlen;
393	>	/* Find the end of dst and adjust bytes left but don't go past end */
394	>	while (n-- != 0 && *d != '\0')
395	>	d++;
396	>	dlen = d - dst;
397	>	n = siz - dlen;
398
399	<	if (n == 0)
400	<	return(dlen + strlen(s));
401	<	while (*s != '\0') {
402	<	if (n != 1) {
403	<	*d++ = *s;
404	<	n--;
405	<	}
406	<	s++;
407	<	}
408	<	*d = '\0';
399	>	if (n == 0)
400	>	return(dlen + strlen(s));
401	>	while (*s != '\0') {
402	>	if (n != 1) {
403	>	*d++ = *s;
404	>	n--;
405	>	}
406	>	s++;
407	>	}
408	>	*d = '\0';
409
410	<	return(dlen + (s - src));       /* count does not include NUL */
410	>	return(dlen + (s - src));       /* count does not include NUL */
411		}
412
413		int sg_update_string(char **dest, const char *src) {
#	Line 450 | Line 449 | kvm_t *sg_get_kvm() {
449		}
450
451		kvmd = kvm_openfiles(NULL, NULL, NULL, O_RDONLY, NULL);
452	+	if(kvmd == NULL) {
453	+	sg_set_error(SG_ERROR_KVM_OPENFILES, NULL);
454	+	}
455		return kvmd;
456		}
457
#	Line 462 | Line 464 | kvm_t *sg_get_kvm2() {
464		}
465
466		kvmd2 = kvm_openfiles(_PATH_DEVNULL, _PATH_DEVNULL, NULL, O_RDONLY, NULL);
467	+	if(kvmd2 == NULL) {
468	+	sg_set_error(SG_ERROR_KVM_OPENFILES, NULL);
469	+	}
470		return kvmd2;
471		}
472		#endif
#	Line 477 | Line 482 | struct uvmexp *sg_get_uvmexp() {
482		mib[1] = VM_UVMEXP;
483
484		if (sysctl(mib, 2, &uvm, &size, NULL, 0) < 0) {
485	+	sg_set_error(SG_ERROR_SYSCTL, "CTL_VM.VM_UVMEXP");
486		return NULL;
487		}
488
#	Line 506 | Line 512 | int sg_init(){
512		}
513
514		int sg_drop_privileges() {
515	<	if (setegid(getgid()) != 0) return -1;
516	<	if (seteuid(getuid()) != 0) return -1;
515	>	if (setegid(getgid()) != 0) {
516	>	sg_set_error(SG_ERROR_SETEGID, NULL);
517	>	return -1;
518	>	}
519	>	if (seteuid(getuid()) != 0) {
520	>	sg_set_error(SG_ERROR_SETEUID, NULL);
521	>	return -1;
522	>	}
523		return 0;
524		}
525
#	Line 515 | Line 527 | void *sg_realloc(void *ptr, size_t size) {
527		void *tmp = NULL;
528		tmp = realloc(ptr, size);
529		if(tmp == NULL) {
530	<	sg_set_error(SG_ERROR_MALLOC_FAILED, NULL);
530	>	sg_set_error(SG_ERROR_MALLOC, NULL);
531		}
532		return tmp;
533		}

Diff Legend

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