[Xfce4-commits] <xfce4-taskmanager:master> Set Task name from p_comm field, and cmdline from KERN_PROC_ARGV

[Landry Breuil]

Updating branch refs/heads/master
         to a721cda4bef3a7c23d897f2e3c87a6ccc8343afc (commit)
       from 44dc437214888be0b21d25830976a76a88a4bd20 (commit)

commit a721cda4bef3a7c23d897f2e3c87a6ccc8343afc
Author: Landry Breuil <landry at rhaalovely.net>
Date:   Thu May 13 20:07:35 2010 +0200

    Set Task name from p_comm field, and cmdline from KERN_PROC_ARGV

 src/task-manager-bsd.c |   10 +++-------
 1 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/src/task-manager-bsd.c b/src/task-manager-bsd.c
index a7fd71f..12114a1 100644
--- a/src/task-manager-bsd.c
+++ b/src/task-manager-bsd.c
@@ -76,11 +76,9 @@ gboolean get_task_list (GArray *task_list)
 		t.vsz *= getpagesize();
 		t.rss = p.p_vm_rssize * getpagesize();
 		g_snprintf(t.state, sizeof t.state, "%s", state_abbrev[p.p_stat]);
+		g_strlcpy(t.name, p.p_comm, strlen(p.p_comm) + 1);
 		/* shamelessly stolen from top/machine.c */
-		/* short version: g_strlcpy(t.name, p.p_comm, strlen(p.p_comm) + 1); */
-		if (P_ZOMBIE(&p)) {
-			g_strlcpy(t.name, p.p_comm, strlen(p.p_comm) + 1);
-		} else {
+		if (!P_ZOMBIE(&p)) {
 			size = 128;
 			if ((args = malloc(size)) == NULL)
 				errx(1,"failed to allocate memory for argv structures");
@@ -101,9 +99,7 @@ gboolean get_task_list (GArray *task_list)
 				strlcat(buf, *ptr, sizeof(buf));
 			}
 			free(args);
-			/* TODO: set difference */
-			g_snprintf(t.name, sizeof t.name, "%s", buf);
-			g_strlcpy(t.cmdline, t.name, sizeof t.name);
+			g_snprintf(t.cmdline, sizeof t.cmdline, "%s", buf);
 		}
 
 		t.cpu_user = (100.0 * ((double) p.p_pctcpu / FSCALE));