From fcc65bf14d0ba5c1b812cf63047db489bf2b6c22 Mon Sep 17 00:00:00 2001
From: Alessio Sergi <al3hex@gmail.com>
Date: Sun, 6 Mar 2016 19:00:09 +0100
Subject: [PATCH] Fix highlighting of process when it contains whitespaces
 (issue #546)

---
 glances/plugins/glances_processlist.py | 20 ++++++++++----------
 glances/processes.py                   |  3 +--
 2 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/glances/plugins/glances_processlist.py b/glances/plugins/glances_processlist.py
index d75feaab..0a5eae45 100644
--- a/glances/plugins/glances_processlist.py
+++ b/glances/plugins/glances_processlist.py
@@ -290,22 +290,22 @@ class Plugin(GlancesPlugin):
         # If no command line for the process is available, fallback to
         # the bare process name instead
         cmdline = p['cmdline']
-        argument = ' '.join(cmdline.split()[1:])
         try:
-            if cmdline == '':
-                msg = ' {0}'.format(p['name'])
-                ret.append(self.curse_add_line(msg, splittable=True))
-            else:
-                cmd = cmdline.split()[0]
-                path, basename = os.path.split(cmd)
+            # XXX: remove `cmdline != ['']` when we'll drop support for psutil<4.0.0
+            if cmdline and cmdline != ['']:
+                path, cmd = os.path.split(cmdline[0])
                 if os.path.isdir(path) and not args.process_short_name:
                     msg = ' {0}'.format(path) + os.sep
                     ret.append(self.curse_add_line(msg, splittable=True))
-                    ret.append(self.curse_add_line(basename, decoration='PROCESS', splittable=True))
+                    ret.append(self.curse_add_line(cmd, decoration='PROCESS', splittable=True))
                 else:
-                    msg = ' {0}'.format(basename)
+                    msg = ' {0}'.format(cmd)
                     ret.append(self.curse_add_line(msg, decoration='PROCESS', splittable=True))
-                msg = ' {0}'.format(argument)
+                arguments = ' '.join(cmdline[1:]).replace('\n', ' ')
+                msg = ' {0}'.format(arguments)
+                ret.append(self.curse_add_line(msg, splittable=True))
+            else:
+                msg = ' {0}'.format(p['name'])
                 ret.append(self.curse_add_line(msg, splittable=True))
         except UnicodeEncodeError:
             ret.append(self.curse_add_line('', splittable=True))
diff --git a/glances/processes.py b/glances/processes.py
index f870d33f..b6978d9f 100644
--- a/glances/processes.py
+++ b/glances/processes.py
@@ -392,8 +392,7 @@ class GlancesProcesses(object):
         except KeyError:
             # Patch for issue #391
             try:
-                self.cmdline_cache[
-                    procstat['pid']] = ' '.join(proc.cmdline())
+                self.cmdline_cache[procstat['pid']] = proc.cmdline()
             except (AttributeError, UnicodeDecodeError, psutil.AccessDenied, psutil.NoSuchProcess):
                 self.cmdline_cache[procstat['pid']] = ""
         procstat['cmdline'] = self.cmdline_cache[procstat['pid']]