From c03e2fac2ba7c4397ef4cb2d6b00f8270dca64c8 Mon Sep 17 00:00:00 2001 From: Jesse Smith Date: Fri, 23 Nov 2018 18:00:23 -0400 Subject: [PATCH] Added fix to pidof which re-enabled the omit (-o) flag. this was broken when formatting was added in the 2.92 release. Closes Debian bug #914494. --- doc/Changelog | 11 ++++++++++- src/killall5.c | 2 +- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/doc/Changelog b/doc/Changelog index f9526b5..edf4c10 100644 --- a/doc/Changelog +++ b/doc/Changelog @@ -1,4 +1,13 @@ -sysvinit (2.92) unreleased; urgency=low +sysvinit (2.93) released; urgency=low + + [ Jesse Smith ] + + * Fixed error where pidof would not omit checking PIDs passed + to it when the -o flag was used. + Fixes Debian bug #913394. + + +sysvinit (2.92) released; urgency=low [ Jesse Smith ] diff --git a/src/killall5.c b/src/killall5.c index 27b5778..25b333e 100644 --- a/src/killall5.c +++ b/src/killall5.c @@ -1006,7 +1006,7 @@ int main_pidof(int argc, char **argv) if ((token = getenv("PIDOF_NETFS")) && (strcmp(token,"no") != 0)) flags |= PIDOF_NETFS; - while ((opt = getopt(argc,argv,"qhcof:sxn")) != EOF) switch (opt) { + while ((opt = getopt(argc,argv,"qhco:f:sxn")) != EOF) switch (opt) { case '?': nsyslog(LOG_ERR,"invalid options on command line!\n"); closelog();