ViewVC Help

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

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

Comparing projects/libstatgrab/src/libstatgrab/process_stats.c (file contents):
Revision 1.43 by tdb, Sun Apr 4 22:48:50 2004 UTC vs.
Revision 1.45 by tdb, Sun Apr 4 23:35:45 2004 UTC

#	Line 82 | Line 82 | int get_proc_snapshot(proc_state_t **ps){
82		kvm_t *kvmd;
83		char **args;
84		int alloc;
85	+	char *proctitletmp;
86		#else
87		long buflen;
88		char *p;
#	Line 297 | Line 298 | int get_proc_snapshot(proc_state_t **ps){
298		proc_state_ptr->proctitle = NULL;
299		}
300		else if(size > 0) {
301	<	proc_state_ptr->proctitle = malloc(size);
301	>	proc_state_ptr->proctitle = malloc(size+1);
302		if(proc_state_ptr->proctitle == NULL) {
303		return NULL;
304		}
305		p = proctitle;
306		proc_state_ptr->proctitle[0] = NULL;
307		do {
308	<	strncat(proc_state_ptr->proctitle, p, strlen(p));
309	<	strncat(proc_state_ptr->proctitle, " ", 1);
308	>	strlcat(proc_state_ptr->proctitle, p, size+1);
309	>	strlcat(proc_state_ptr->proctitle, " ", size+1);
310		p += strlen(p) + 1;
311		} while (p < proctitle + size);
312		free(proctitle);
313	<	proc_state_ptr->proctitle[strlen(proc_state_ptr->proctitle)-1] = NULL;
313	>	/* remove trailing space */
314	>	proc_state_ptr->proctitle[strlen(proc_state_ptr->proctitle)-1] = '\0';
315		}
316		else {
317		free(proctitle);
#	Line 326 | Line 328 | int get_proc_snapshot(proc_state_t **ps){
328		}
329		while(*args != NULL) {
330		if(strlen(proctitle) + strlen(*args) >= alloc) {
331	<	alloc = (alloc + strlen(*args)) << 1;
332	<	proctitle = realloc(proctitle, alloc);
333	<	if(proctitle == NULL) {
331	>	alloc = (alloc + strlen(*args)) * 2;
332	>	proctitletmp = realloc(proctitle, alloc);
333	>	if(proctitletmp == NULL) {
334		return NULL;
335		}
336	+	proctitle = proctitletmp;
337		}
338	<	strncat(proctitle, *args, strlen(*args));
339	<	strncat(proctitle, " ", 1);
338	>	strlcat(proctitle, *args, alloc);
339	>	strlcat(proctitle, " ", alloc);
340		args++;
341		}
342		/* remove trailing space */
343	<	proctitle[strlen(proctitle)-1] = NULL;
343	>	proctitle[strlen(proctitle)-1] = '\0';
344		proc_state_ptr->proctitle = proctitle;
345		}
346		else {

Diff Legend

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