diff options
| -rw-r--r-- | doc/index.html | 2 | ||||
| -rw-r--r-- | doc/s6-setsid.html | 11 | ||||
| -rw-r--r-- | doc/upgrade.html | 6 | ||||
| -rw-r--r-- | package/info | 2 | ||||
| -rw-r--r-- | src/daemontools-extras/s6-setsid.c | 4 |
5 files changed, 16 insertions, 9 deletions
diff --git a/doc/index.html b/doc/index.html index c8db7c9..f4f4add 100644 --- a/doc/index.html +++ b/doc/index.html @@ -99,7 +99,7 @@ library. </li> <h3> Download </h3> <ul> - <li> The current released version of s6 is <a href="s6-2.1.1.2.tar.gz">2.1.1.2</a>. </li> + <li> The current released version of s6 is <a href="s6-2.1.2.0.tar.gz">2.1.2.0</a>. </li> <li> Alternatively, you can checkout a copy of the s6 git repository: <pre> git clone git://git.skarnet.org/s6 </pre> </li> </ul> diff --git a/doc/s6-setsid.html b/doc/s6-setsid.html index d5046af..966c723 100644 --- a/doc/s6-setsid.html +++ b/doc/s6-setsid.html @@ -31,7 +31,7 @@ foreground or background process group. <ul> <li> s6-setsid creates a new session, or a new process group, and may make that process group the foreground process group, -depending on the options it has been given. </li> +depending on the options it is run with. </li> <li> As session leader or process group leader, s6-setsid then executes into <em>prog...</em>. </li> </ul> @@ -55,9 +55,9 @@ sent a SIGCONT to resume. To avoid that, use the next option. </li> not create a new session, but will create a new process group and attach its session's controlling terminal to the new process group before executing <em>prog</em>. It will forcefully grab the controlling -terminal from the former foreground process group, which means that -a process belonging to the former foreground process group attempting -to read from or write to that terminal will be stopped. </li> +terminal from the former foreground process group: a process +belonging to that former foreground process group will be stopped if +it attempts to read from or write to that terminal. </li> <li> <tt>-i</tt> : strict. If s6-setsid cannot perform the operations it needs, it will exit 111 with an error message. </li> <li> <tt>-I</tt> : loose. If s6-setsid cannot perform the operations, @@ -66,7 +66,8 @@ This is the default. </li> <li> <tt>-q</tt> : silent. s6-setsid will not print any warning message; it will exec into <em>prog</em> even if it cannot perform the operations. </li> - <li> <tt>-d <em>ctty</em></tt> : assume <em>ctty</em> is + <li> <tt>-d <em>ctty</em></tt> : assume file descriptor +number <em>ctty</em> is the controlling terminal for the current session. Default is 0. This is only useful when used with the <tt>-f</tt> or <tt>-g</tt> options. </li> diff --git a/doc/upgrade.html b/doc/upgrade.html index fd3d08e..0777b51 100644 --- a/doc/upgrade.html +++ b/doc/upgrade.html @@ -17,6 +17,12 @@ <h1> What has changed in s6 </h1> +<h2> in 2.1.2.0 </h2> + +<ul> + <li> New options to <a href="s6-setsid.html">s6-setsid</a>. </li> +</ul> + <h2> in 2.1.1.2 </h2> <ul> diff --git a/package/info b/package/info index a02e5c7..3993f04 100644 --- a/package/info +++ b/package/info @@ -1,4 +1,4 @@ package=s6 -version=2.1.1.2 +version=2.1.2.0 category=admin package_macro_name=S6 diff --git a/src/daemontools-extras/s6-setsid.c b/src/daemontools-extras/s6-setsid.c index 51de048..609b041 100644 --- a/src/daemontools-extras/s6-setsid.c +++ b/src/daemontools-extras/s6-setsid.c @@ -19,7 +19,7 @@ int main (int argc, char const *const *argv, char const *const *envp) subgetopt_t l = SUBGETOPT_ZERO ; for (;;) { - register int opt = subgetopt_r(argc, argv, "sbfgiIqt:", &l) ; + register int opt = subgetopt_r(argc, argv, "sbfgiIqd:", &l) ; if (opt == -1) break ; switch (opt) { @@ -30,7 +30,7 @@ int main (int argc, char const *const *argv, char const *const *envp) case 'i' : insist = 2 ; break ; case 'I' : insist = 1 ; break ; case 'q' : insist = 0 ; break ; - case 't' : if (!uint0_scan(l.arg, &ctty)) dieusage() ; break ; + case 'd' : if (!uint0_scan(l.arg, &ctty)) dieusage() ; break ; default : dieusage() ; } } |