From 012db8222e1bce097d99cdf274d85835ec505f2b Mon Sep 17 00:00:00 2001 From: Craig Small Date: Sat, 21 Sep 2019 16:17:05 +1000 Subject: pidof: Fix separator option Short separator option used 's' instead of 'S' which meant it pidof would use the single-shot option when you meant separator. Added alias for -S using -d to give some sysvinit pidof compatibility. References: commit 73492b182dc60c1605d1b0d62de651fad97807af procps-ng/procps#141 --- pidof.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'pidof.c') diff --git a/pidof.c b/pidof.c index c428811..cff9126 100644 --- a/pidof.c +++ b/pidof.c @@ -295,13 +295,13 @@ int main (int argc, char **argv) int first_pid = 1; const char *separator = " "; - const char *opts = "scnxmo:S:?Vh"; + const char *opts = "scdnxmo:S:?Vh"; static const struct option longopts[] = { {"check-root", no_argument, NULL, 'c'}, {"single-shot", no_argument, NULL, 's'}, {"omit-pid", required_argument, NULL, 'o'}, - {"separator", required_argument, NULL, 's'}, + {"separator", required_argument, NULL, 'S'}, {"help", no_argument, NULL, 'h'}, {"version", no_argument, NULL, 'V'}, {NULL, 0, NULL, 0} @@ -334,6 +334,7 @@ int main (int argc, char **argv) pidof_root = pid_link(getpid(), "root"); } break; + case 'd': /* sysv pidof uses this for S */ case 'S': separator = optarg; break; -- cgit v1.2.1