Re: xfce4-taskmanager-0.2.1 patch

	Hi:

	I am sorry. I send the patch as attatchment, but the patch is a
really short file. I post the text patch.

cheers

Xavier


--- xfce4-taskmanager-0.2.1/src/functions.c	2005-02-01 23:32:27.000000000 +0100
+++ xfce4-taskmanager-0.2.1_xop/src/functions.c	2005-04-03 23:51:54.000000000 +0200
@@ -62,6 +62,8 @@
 			g_strlcat(task_file_name,"/status", 256);
 		
 			gchar buffer[256];
+			gchar label[256];
+			gchar **tmp, **tmp_uid;
 			gint line_count = 0;
 			struct task task;
 			struct passwd *passwdp;
@@ -70,7 +72,7 @@
 			{
 				while(fgets(buffer, 256, task_file) != NULL)
 				{
-					if(line_count == 0)
+/*					if(line_count == 0)
 						strcpy(task.name,g_strstrip(g_strsplit(buffer, ":", 2)[1]));
 					else if(line_count == 3)
 						strcpy(task.pid,g_strstrip(g_strsplit(buffer, ":", 2)[1]));
@@ -81,7 +83,23 @@
 						passwdp = getpwuid(atoi(g_strsplit(g_strstrip(g_strsplit(buffer, ":", 2)[1]), "\t", 2)[0])); 
 						strcpy(task.uid, passwdp->pw_name);
 					}
-					
+*/
+					tmp=g_strsplit(buffer, ":", 2);
+					strcpy(label,tmp[0]);
+					if(!strcmp(label,"Name"))
+						strcpy(task.name,g_strstrip(tmp[1]));
+					else if(!strcmp(label,"Pid"))
+						strcpy(task.pid,g_strstrip(tmp[1]));
+					else if(!strcmp(label,"PPid"))
+						strcpy(task.ppid,g_strstrip(tmp[1]));
+					else if(!strcmp(label,"Uid"))
+					{
+						tmp_uid=g_strsplit(g_strstrip(tmp[1]), "\t", 2);
+						passwdp = getpwuid(atoi(tmp_uid[0])); 
+						strcpy(task.uid, passwdp->pw_name);
+						g_strfreev(tmp_uid);
+					}
+					g_strfreev(tmp);
 					line_count++;
 				}
 			








On Tue, 05 Apr 2005 12:00:06 +0200
[email protected] wrote:

> Send xfce-goodies-dev mailing list submissions to
> 	[email protected]
> 
> To subscribe or unsubscribe via the World Wide Web, visit
> 	http://lists.berlios.de/mailman/listinfo/xfce-goodies-dev
> or, via email, send a message with subject or body 'help' to
> 	[email protected]
> 
> You can reach the person managing the list at
> 	[email protected]
> 
> When replying, please edit your Subject line so it is more specific
> than "Re: Contents of xfce-goodies-dev digest..."
> 
> 
> Today's Topics:
> 
>    1. xfce4-taskmanager-0.2.1 patch (Xavier Otazu)
> 
> --__--__--
> 
> Message: 1
> Date: Mon, 04 Apr 2005 16:34:22 +0200
> From: Xavier Otazu <[email protected]>
> Subject: xfce4-taskmanager-0.2.1 patch
> To: [email protected]
> Organization: CVC
> Reply-To: [email protected]
> 
> 
> --Boundary_(ID_eD2tCUAmWtB6rkrjhYB+LA)
> Content-type: text/plain; charset=US-ASCII
> Content-disposition: inline
> 
> 
> 
> 	Hi!
> 
> 	The 0.2.1 version of xfce4-taslmanager produced a segmentation
> fault on my computer (Slackware 10.0 kernel 2.4.29). It also had some
> memory leaks that increased memory size at a 100Kb/s rate.
> 
> 	I attach a patch that solves the segmentation error and memory
> leaks.
> 
> cheers
> 
> Xavier
> 
> 
> 
> --Boundary_(ID_eD2tCUAmWtB6rkrjhYB+LA)
> Content-type: application/octet-stream;
>  name=xfce4-taskmanager-0.2.1_memleak.diff
> Content-disposition: attachment; filename=xfce4-taskmanager-
> 0.2.1_memleak.diff Content-transfer-encoding: BASE64
> 
> LS0tIHhmY2U0LXRhc2ttYW5hZ2VyLTAuMi4xL3NyYy9mdW5jdGlvbnMuYwkyMDA1
> LTAyLTAxIDIzOjMyOjI3LjAwMDAwMDAwMCArMDEwMAorKysgeGZjZTQtdGFza21h
> bmFnZXItMC4yLjFfeG9wL3NyYy9mdW5jdGlvbnMuYwkyMDA1LTA0LTAzIDIzOjUx
> OjU0LjAwMDAwMDAwMCArMDIwMApAQCAtNjIsNiArNjIsOCBAQAogCQkJZ19zdHJs
> Y2F0KHRhc2tfZmlsZV9uYW1lLCIvc3RhdHVzIiwgMjU2KTsKIAkJCiAJCQlnY2hh
> ciBidWZmZXJbMjU2XTsKKwkJCWdjaGFyIGxhYmVsWzI1Nl07CisJCQlnY2hhciAq
> KnRtcCwgKip0bXBfdWlkOwogCQkJZ2ludCBsaW5lX2NvdW50ID0gMDsKIAkJCXN0
> cnVjdCB0YXNrIHRhc2s7CiAJCQlzdHJ1Y3QgcGFzc3dkICpwYXNzd2RwOwpAQCAt
> NzAsNyArNzIsNyBAQAogCQkJewogCQkJCXdoaWxlKGZnZXRzKGJ1ZmZlciwgMjU2
> LCB0YXNrX2ZpbGUpICE9IE5VTEwpCiAJCQkJewotCQkJCQlpZihsaW5lX2NvdW50
> ID09IDApCisvKgkJCQkJaWYobGluZV9jb3VudCA9PSAwKQogCQkJCQkJc3RyY3B5
> KHRhc2submFtZSxnX3N0cnN0cmlwKGdfc3Ryc3BsaXQoYnVmZmVyLCAiOiIsIDIp
> WzFdKSk7CiAJCQkJCWVsc2UgaWYobGluZV9jb3VudCA9PSAzKQogCQkJCQkJc3Ry
> Y3B5KHRhc2sucGlkLGdfc3Ryc3RyaXAoZ19zdHJzcGxpdChidWZmZXIsICI6Iiwg
> MilbMV0pKTsKQEAgLTgxLDcgKzgzLDIzIEBACiAJCQkJCQlwYXNzd2RwID0gZ2V0
> cHd1aWQoYXRvaShnX3N0cnNwbGl0KGdfc3Ryc3RyaXAoZ19zdHJzcGxpdChidWZm
> ZXIsICI6IiwgMilbMV0pLCAiXHQiLCAyKVswXSkpOyAKIAkJCQkJCXN0cmNweSh0
> YXNrLnVpZCwgcGFzc3dkcC0+cHdfbmFtZSk7CiAJCQkJCX0KLQkJCQkJCisqLwor
> CQkJCQl0bXA9Z19zdHJzcGxpdChidWZmZXIsICI6IiwgMik7CisJCQkJCXN0cmNw
> eShsYWJlbCx0bXBbMF0pOworCQkJCQlpZighc3RyY21wKGxhYmVsLCJOYW1lIikp
> CisJCQkJCQlzdHJjcHkodGFzay5uYW1lLGdfc3Ryc3RyaXAodG1wWzFdKSk7CisJ
> CQkJCWVsc2UgaWYoIXN0cmNtcChsYWJlbCwiUGlkIikpCisJCQkJCQlzdHJjcHko
> dGFzay5waWQsZ19zdHJzdHJpcCh0bXBbMV0pKTsKKwkJCQkJZWxzZSBpZighc3Ry
> Y21wKGxhYmVsLCJQUGlkIikpCisJCQkJCQlzdHJjcHkodGFzay5wcGlkLGdfc3Ry
> c3RyaXAodG1wWzFdKSk7CisJCQkJCWVsc2UgaWYoIXN0cmNtcChsYWJlbCwiVWlk
> IikpCisJCQkJCXsKKwkJCQkJCXRtcF91aWQ9Z19zdHJzcGxpdChnX3N0cnN0cmlw
> KHRtcFsxXSksICJcdCIsIDIpOworCQkJCQkJcGFzc3dkcCA9IGdldHB3dWlkKGF0
> b2kodG1wX3VpZFswXSkpOyAKKwkJCQkJCXN0cmNweSh0YXNrLnVpZCwgcGFzc3dk
> cC0+cHdfbmFtZSk7CisJCQkJCQlnX3N0cmZyZWV2KHRtcF91aWQpOworCQkJCQl9
> CisJCQkJCWdfc3RyZnJlZXYodG1wKTsKIAkJCQkJbGluZV9jb3VudCsrOwogCQkJ
> CX0KIAkJCQo=
> 
> --Boundary_(ID_eD2tCUAmWtB6rkrjhYB+LA)--
> 
> 
> --__--__--
> 
> _______________________________________________
> xfce-goodies-dev mailing list
> [email protected]
> http://lists.berlios.de/mailman/listinfo/xfce-goodies-dev
> 
> 
> End of xfce-goodies-dev Digest