diff options
| -rw-r--r-- | INSTALL | 2 | ||||
| -rw-r--r-- | NEWS | 6 | ||||
| -rw-r--r-- | doc/index.html | 4 | ||||
| -rw-r--r-- | doc/upgrade.html | 7 | ||||
| -rw-r--r-- | package/info | 2 | ||||
| -rw-r--r-- | src/libs6rc/s6rc_livedir_create.c | 5 |
6 files changed, 22 insertions, 4 deletions
diff --git a/INSTALL b/INSTALL index 1062599..0e59450 100644 --- a/INSTALL +++ b/INSTALL @@ -7,7 +7,7 @@ Build Instructions - A POSIX-compliant C development environment - GNU make version 3.81 or later - skalibs version 2.13.1.0 or later: https://skarnet.org/software/skalibs/ - - execline version 2.9.2.0 or later: https://skarnet.org/software/execline/ + - execline version 2.9.2.1 or later: https://skarnet.org/software/execline/ - s6 version 2.11.3.0 or later: https://skarnet.org/software/s6/ This software will run on any operating system that implements diff --git a/NEWS b/NEWS index e799493..3b5f3bc 100644 --- a/NEWS +++ b/NEWS @@ -1,5 +1,11 @@ Changelog for s6-rc. +In 0.5.4.1 +---------- + + - Bugfixes. + + In 0.5.4.0 ---------- diff --git a/doc/index.html b/doc/index.html index 7bd994d..67d72b1 100644 --- a/doc/index.html +++ b/doc/index.html @@ -51,7 +51,7 @@ scripts are also run in a controlled environment. 2.13.1.0 or later. It's a build-time requirement. It's also a run-time requirement if you link against the shared version of the skalibs library. </li> <li> <a href="//skarnet.org/software/execline/">execline</a> version -2.9.2.0 or later. It's a build-time <em>and</em> run-time requirement. </li> +2.9.2.1 or later. It's a build-time <em>and</em> run-time requirement. </li> <li> <a href="//skarnet.org/software/s6/">s6</a> version 2.11.3.0 or later. It's a build-time <em>and</em> run-time requirement. </li> </ul> @@ -67,7 +67,7 @@ requirement if you link against the shared version of the skalibs library. </li> <ul> <li> The current released version of s6-rc is -<a href="s6-rc-0.5.4.0.tar.gz">0.5.4.0</a>. </li> +<a href="s6-rc-0.5.4.1.tar.gz">0.5.4.1</a>. </li> <li> Alternatively, you can checkout a copy of the <a href="//git.skarnet.org/cgi-bin/cgit.cgi/s6-rc/">s6-rc git repository</a>: diff --git a/doc/upgrade.html b/doc/upgrade.html index 13bfad5..6c66f1e 100644 --- a/doc/upgrade.html +++ b/doc/upgrade.html @@ -30,6 +30,13 @@ minor and bugfix version changes. <h1> What has changed in s6-rc </h1> +<h2> in 0.5.4.1 </h2> + +<ul> + <li> <a href="//skarnet.org/software/execline/">execline</a> +dependency bumped to 2.9.2.1. </li> +</ul> + <h2> in 0.5.4.0 </h2> <ul> diff --git a/package/info b/package/info index 431056e..0c7e8e7 100644 --- a/package/info +++ b/package/info @@ -1,4 +1,4 @@ package=s6-rc -version=0.5.4.0 +version=0.5.4.1 category=admin package_macro_name=S6RC diff --git a/src/libs6rc/s6rc_livedir_create.c b/src/libs6rc/s6rc_livedir_create.c index bd44bd6..e4056b1 100644 --- a/src/libs6rc/s6rc_livedir_create.c +++ b/src/libs6rc/s6rc_livedir_create.c @@ -1,13 +1,16 @@ /* ISC license. */ #include <skalibs/nonposix.h> + #include <sys/stat.h> #include <errno.h> #include <string.h> #include <unistd.h> #include <stdlib.h> + #include <skalibs/stralloc.h> #include <skalibs/djbunix.h> + #include <s6-rc/s6rc-utils.h> int s6rc_livedir_create (stralloc *sa, char const *live, char const *suffix, char const *scdir, char const *prefix, char const *compiled, unsigned char const *state, unsigned int statelen, size_t *dirlen) @@ -33,6 +36,8 @@ int s6rc_livedir_create (stralloc *sa, char const *live, char const *suffix, cha if (!openwritenclose_unsafe(sa->s + sabase, prefix, strlen(prefix))) goto delerr ; strcpy(sa->s + newlen, "state") ; if (!openwritenclose_unsafe(sa->s + sabase, (char const *)state, statelen)) goto delerr ; + strcpy(sa->s + newlen, "lock") ; + if (!openwritenclose_unsafe(sa->s + sabase, "", 0)) goto delerr ; sa->len = newlen-1 ; sa->s[newlen-1] = 0 ; *dirlen = ddirlen ; |