43 lines
1.3 KiB
Diff
43 lines
1.3 KiB
Diff
From 6f1c04259d979ff04d129f235c950e48e94c7e76 Mon Sep 17 00:00:00 2001
|
|
From: Elliott Forney <elliott.forney@gmail.com>
|
|
Date: Thu, 30 Jan 2014 21:36:26 +1100
|
|
Subject: [PATCH] pgrep fails to show full command line with -au
|
|
|
|
pgrep does not show the full command line when the -a and -u flags are
|
|
combined. The -a flag is ignored when the -u flag is used as well.
|
|
|
|
In addition, the supplied patch by Elliot did not fix the problem
|
|
when invert flag ( -v ) was used; a very small tweak to the patch
|
|
fixed this problem as well. This problem existed before.
|
|
|
|
Signed-off-by: Craig Small <csmall@enc.com.au>
|
|
---
|
|
pgrep.c | 4 ++--
|
|
1 file changed, 2 insertions(+), 2 deletions(-)
|
|
|
|
diff --git pgrep.c pgrep.c
|
|
index 93a7c89..2a0ee19 100644
|
|
--- pgrep.c
|
|
+++ pgrep.c
|
|
@@ -417,7 +417,7 @@ static PROCTAB *do_openproc (void)
|
|
PROCTAB *ptp;
|
|
int flags = 0;
|
|
|
|
- if (opt_pattern || opt_full)
|
|
+ if (opt_pattern || opt_full || opt_longlong)
|
|
flags |= PROC_FILLCOM;
|
|
if (opt_ruid || opt_rgid)
|
|
flags |= PROC_FILLSTATUS;
|
|
@@ -538,7 +538,7 @@ static struct el * select_procs (int *num)
|
|
match = match_strlist (tty, opt_term);
|
|
}
|
|
}
|
|
- if (task.cmdline && (opt_longlong || opt_full) && match && opt_pattern) {
|
|
+ if (task.cmdline && (opt_longlong || opt_full) ) {
|
|
int i = 0;
|
|
int bytes = sizeof (cmdline) - 1;
|
|
|
|
--
|
|
1.7.9.2
|
|
|