53ec6254a8
- pidof: new -w option to show kernel worker threads - pkill: manpage to document -e option - Resolves: bz#1629413 - Resolves: bz#1399206
59 lines
1.9 KiB
Diff
59 lines
1.9 KiB
Diff
diff --git a/ps/output.c b/ps/output.c
|
|
index e718f19..b66d543 100644
|
|
--- a/ps/output.c
|
|
+++ b/ps/output.c
|
|
@@ -1250,6 +1250,26 @@ static int pr_luid(char *restrict const outbuf, const proc_t *restrict const pp)
|
|
}
|
|
|
|
|
|
+/* full path to executable */
|
|
+static int pr_exe(char *restrict const outbuf, const proc_t *restrict const pp){
|
|
+ char filename[48];
|
|
+ ssize_t num_read = 0;
|
|
+
|
|
+ snprintf(filename, sizeof filename, "/proc/%d/exe", pp->tgid);
|
|
+
|
|
+ num_read = readlink(filename, outbuf, OUTBUF_SIZE-1);
|
|
+ if (num_read > 0) {
|
|
+ outbuf[num_read] = '\0';
|
|
+ }
|
|
+ else {
|
|
+ outbuf[0] = '-';
|
|
+ outbuf[1] = '\0';
|
|
+ num_read = 1;
|
|
+ }
|
|
+
|
|
+ return num_read;
|
|
+}
|
|
+
|
|
/************************* Systemd stuff ********************************/
|
|
static int pr_sd_unit(char *restrict const outbuf, const proc_t *restrict const pp){
|
|
return snprintf(outbuf, COLWID, "%s", pp->sd_unit);
|
|
@@ -1533,6 +1553,7 @@ static const format_struct format_array[] = {
|
|
{"etimes", "ELAPSED", pr_etimes, sr_etime, 7, 0, BSD, ET|RIGHT}, /* FreeBSD */
|
|
{"euid", "EUID", pr_euid, sr_euid, 5, 0, LNX, ET|RIGHT},
|
|
{"euser", "EUSER", pr_euser, sr_euser, 8, USR, LNX, ET|USER},
|
|
+{"exe", "EXE", pr_exe, sr_nop, 27, 0, LNX, PO|UNLIMITED},
|
|
{"f", "F", pr_flag, sr_flags, 1, 0, XXX, ET|RIGHT}, /*flags*/
|
|
{"fgid", "FGID", pr_fgid, sr_fgid, 5, 0, LNX, ET|RIGHT},
|
|
{"fgroup", "FGROUP", pr_fgroup, sr_fgroup, 8, GRP, LNX, ET|USER},
|
|
diff --git a/ps/ps.1 b/ps/ps.1
|
|
index 844341c..6818667 100644
|
|
--- a/ps/ps.1
|
|
+++ b/ps/ps.1
|
|
@@ -1253,6 +1253,14 @@ option can be used to force the decimal representation. (alias
|
|
.BR uname ", " user ).
|
|
T}
|
|
|
|
+exe EXE T{
|
|
+path to the executable. Useful if path cannot be printed via
|
|
+.BR cmd ", " comm
|
|
+or
|
|
+.BR args
|
|
+format options.
|
|
+T}
|
|
+
|
|
f F T{
|
|
flags associated with the process, see the
|
|
.B PROCESS FLAGS
|