From 6e7719640405db7415f9e14a7bacc3a5e129f577 Mon Sep 17 00:00:00 2001 From: Raz Crimson <52282402+RazCrimson@users.noreply.github.com> Date: Wed, 19 Apr 2023 20:17:36 +0530 Subject: [PATCH 1/2] fix: processlist - imprecise multiline args handling --- glances/plugins/glances_processlist.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/glances/plugins/glances_processlist.py b/glances/plugins/glances_processlist.py index 96872a4b..51087a64 100644 --- a/glances/plugins/glances_processlist.py +++ b/glances/plugins/glances_processlist.py @@ -48,7 +48,7 @@ def split_cmdline(bare_process_name, cmdline): path, cmd = "", cmdline[0] else: path, cmd = os.path.split(cmdline[0]) - arguments = ' '.join(cmdline[1:]).replace('\n', ' ') + arguments = ' '.join(cmdline[1:]) return path, cmd, arguments @@ -409,8 +409,8 @@ class Plugin(GlancesPlugin): if cmdline: path, cmd, arguments = split_cmdline(bare_process_name, cmdline) # Manage end of line in arguments (see #1692) - arguments.replace('\r\n', ' ') - arguments.replace('\n', ' ') + arguments = arguments.replace('\r\n', ' ') + arguments = arguments.replace('\n', ' ') if os.path.isdir(path) and not args.process_short_name: msg = self.layout_stat['command'].format(path) + os.sep ret.append(self.curse_add_line(msg, splittable=True)) From 59cb5579416682e9ced9699c62a6a7c5dffcfe24 Mon Sep 17 00:00:00 2001 From: Raz Crimson <52282402+RazCrimson@users.noreply.github.com> Date: Wed, 19 Apr 2023 20:18:31 +0530 Subject: [PATCH 2/2] chg: processlist - handle tabs in args --- glances/plugins/glances_processlist.py | 1 + 1 file changed, 1 insertion(+) diff --git a/glances/plugins/glances_processlist.py b/glances/plugins/glances_processlist.py index 51087a64..42d655fe 100644 --- a/glances/plugins/glances_processlist.py +++ b/glances/plugins/glances_processlist.py @@ -411,6 +411,7 @@ class Plugin(GlancesPlugin): # Manage end of line in arguments (see #1692) arguments = arguments.replace('\r\n', ' ') arguments = arguments.replace('\n', ' ') + arguments = arguments.replace('\t', ' ') if os.path.isdir(path) and not args.process_short_name: msg = self.layout_stat['command'].format(path) + os.sep ret.append(self.curse_add_line(msg, splittable=True))