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.
This commit is contained in:
Jesse Smith 2018-11-23 18:00:23 -04:00
parent c679a49aac
commit c03e2fac2b
2 changed files with 11 additions and 2 deletions

View File

@ -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 ] [ Jesse Smith ]

View File

@ -1006,7 +1006,7 @@ int main_pidof(int argc, char **argv)
if ((token = getenv("PIDOF_NETFS")) && (strcmp(token,"no") != 0)) if ((token = getenv("PIDOF_NETFS")) && (strcmp(token,"no") != 0))
flags |= PIDOF_NETFS; 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 '?': case '?':
nsyslog(LOG_ERR,"invalid options on command line!\n"); nsyslog(LOG_ERR,"invalid options on command line!\n");
closelog(); closelog();