From e2ea4fc86b67b70b18df8bc27fcf4ec160d3ff7d Mon Sep 17 00:00:00 2001 From: Elliott Hughes Date: Mon, 23 May 2016 10:46:47 -0700 Subject: Fix remaining pkill tests. I don't know that anyone cares, but these failures made me think I'd broken something while testing the -SIGNAL patch. The -s parsing wasn't taking into account that -s 0 is a special case, and the -o test was assuming that pkill can tell the difference between two processes started at roughly the same time. Hopefully there's higher-resolution data available that can avoid the need for yet another sleep in the tests. --- toys/posix/ps.c | 2 ++ 1 file changed, 2 insertions(+) (limited to 'toys/posix/ps.c') diff --git a/toys/posix/ps.c b/toys/posix/ps.c index e5adc192..4f8d75a9 100644 --- a/toys/posix/ps.c +++ b/toys/posix/ps.c @@ -980,6 +980,8 @@ static char *parse_rest(void *data, char *str, int len) if (isdigit(*str)) { ll[pl->len] = xstrtol(str, &end, 10); if (end==(len+str)) num++; + // For pkill, -s 0 represents pkill's session id. + if (pl==&TT.ss && ll[pl->len]==0) ll[pl->len] = getsid(0); } if (pl==&TT.pp || pl==&TT.ss) { -- cgit v1.2.3