diff options
| author | Laurent Bercot <ska-skaware@skarnet.org> | 2022-08-21 02:37:46 +0000 |
|---|---|---|
| committer | Laurent Bercot <ska@appnovation.com> | 2022-08-21 02:37:46 +0000 |
| commit | 355d6a83810e1b7bb3bc2ccd3102141dbea63821 (patch) | |
| tree | 440b74bcb53aa14c8b9636f00154738040a49c73 /src | |
| parent | 6920ddc814d709bc60c162c1fef794b108940e95 (diff) | |
| download | s6-355d6a83810e1b7bb3bc2ccd3102141dbea63821.tar.xz | |
Add upper limit to -c in s6-svscan
Also document it, and document changes to s6-supervise
Signed-off-by: Laurent Bercot <ska@appnovation.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/supervision/s6-supervise.c | 2 | ||||
| -rw-r--r-- | src/supervision/s6-svscan.c | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/src/supervision/s6-supervise.c b/src/supervision/s6-supervise.c index 881d29a..c377e32 100644 --- a/src/supervision/s6-supervise.c +++ b/src/supervision/s6-supervise.c @@ -456,7 +456,7 @@ static int uplastup_z (void) { char fmt0[UINT_FMT] ; char fmt1[UINT_FMT] ; - char *cargv[5] = { "finish", fmt0, fmt1, servicename, 0 } ; + char *cargv[5] = { "finish", fmt0, fmt1, (char *)servicename, 0 } ; selfpipe_finish() ; fmt0[uint_fmt(fmt0, WIFSIGNALED(status.wstat) ? 256 : WEXITSTATUS(status.wstat))] = 0 ; fmt1[uint_fmt(fmt1, WTERMSIG(status.wstat))] = 0 ; diff --git a/src/supervision/s6-svscan.c b/src/supervision/s6-svscan.c index 740df49..ae77ab4 100644 --- a/src/supervision/s6-svscan.c +++ b/src/supervision/s6-svscan.c @@ -560,6 +560,7 @@ int main (int argc, char const *const *argv) if (t) tain_from_millisecs(&defaulttimeout, t) ; else defaulttimeout = tain_infinite_relative ; if (max < 2) max = 2 ; + if (max > 90000) max = 90000 ; } if (notif >= 0) |