summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--INSTALL6
-rw-r--r--NEWS6
-rw-r--r--doc/index.html8
-rw-r--r--doc/upgrade.html11
-rw-r--r--package/info2
-rw-r--r--src/libs6rc/s6rc_livedir_prefix.c2
-rw-r--r--src/libs6rc/s6rc_read_uint.c2
-rw-r--r--src/s6-rc/s6-rc-compile.c8
-rw-r--r--src/s6-rc/s6-rc-update.c3
-rw-r--r--src/s6-rc/s6-rc.c3
10 files changed, 35 insertions, 16 deletions
diff --git a/INSTALL b/INSTALL
index d59f2cd..cd1fc83 100644
--- a/INSTALL
+++ b/INSTALL
@@ -6,9 +6,9 @@ Build Instructions
- A POSIX-compliant C development environment
- GNU make version 3.81 or later
- - skalibs version 2.11.1.0 or later: https://skarnet.org/software/skalibs/
- - execline version 2.8.2.0 or later: https://skarnet.org/software/execline/
- - s6 version 2.11.0.1 or later: https://skarnet.org/software/s6/
+ - skalibs version 2.12.0.0 or later: https://skarnet.org/software/skalibs/
+ - execline version 2.9.0.0 or later: https://skarnet.org/software/execline/
+ - s6 version 2.11.1.0 or later: https://skarnet.org/software/s6/
This software will run on any operating system that implements
POSIX.1-2008, available at:
diff --git a/NEWS b/NEWS
index 80da460..e119194 100644
--- a/NEWS
+++ b/NEWS
@@ -1,5 +1,11 @@
Changelog for s6-rc.
+In 0.5.3.2
+----------
+
+ - Adaptation to skalibs-2.12.0.0.
+
+
In 0.5.3.1
----------
diff --git a/doc/index.html b/doc/index.html
index abac1eb..bfef39b 100644
--- a/doc/index.html
+++ b/doc/index.html
@@ -48,12 +48,12 @@ scripts are also run in a controlled environment.
<li> A POSIX-compliant system with a standard C development environment </li>
<li> GNU make, version 3.81 or later </li>
<li> <a href="//skarnet.org/software/skalibs/">skalibs</a> version
-2.11.1.0 or later. It's a build-time requirement. It's also a run-time
+2.12.0.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.8.2.0 or later. It's a build-time <em>and</em> run-time requirement. </li>
+2.9.0.0 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.0.1 or later. It's a build-time <em>and</em> run-time requirement. </li>
+2.11.1.0 or later. It's a build-time <em>and</em> run-time requirement. </li>
</ul>
<h3> Licensing </h3>
@@ -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.3.1.tar.gz">0.5.3.1</a>. </li>
+<a href="s6-rc-0.5.3.2.tar.gz">0.5.3.2</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 5d87aef..44eff49 100644
--- a/doc/upgrade.html
+++ b/doc/upgrade.html
@@ -30,6 +30,17 @@ minor and bugfix version changes.
<h1> What has changed in s6-rc </h1>
+<h2> in 0.5.3.2 </h2>
+
+<ul>
+ <li> <a href="//skarnet.org/software/skalibs/">skalibs</a>
+dependency bumped to 2.12.0.0. </li>
+ <li> <a href="//skarnet.org/software/execline/">execline</a>
+dependency bumped to 2.9.0.0. </li>
+ <li> <a href="//skarnet.org/software/s6/">s6</a>
+dependency bumped to 2.11.1.0. </li>
+</ul>
+
<h2> in 0.5.3.1 </h2>
<ul>
diff --git a/package/info b/package/info
index 1d6b381..f212d7c 100644
--- a/package/info
+++ b/package/info
@@ -1,4 +1,4 @@
package=s6-rc
-version=0.5.3.1
+version=0.5.3.2
category=admin
package_macro_name=S6RC
diff --git a/src/libs6rc/s6rc_livedir_prefix.c b/src/libs6rc/s6rc_livedir_prefix.c
index 09fe263..e28c078 100644
--- a/src/libs6rc/s6rc_livedir_prefix.c
+++ b/src/libs6rc/s6rc_livedir_prefix.c
@@ -13,7 +13,7 @@ ssize_t s6rc_livedir_prefix (char const *live, char *s, size_t n)
memcpy(sfn, live, llen) ;
memcpy(sfn + llen, "/prefix", 8) ;
r = openreadnclose(sfn, s, n) ;
- if (r < 0) return errno == ENOENT ? 0 : r ;
+ if (r == -1) return errno == ENOENT ? 0 : r ;
if (memchr(s, '/', r) || memchr(s, '\n', r)) return (errno = EINVAL, -1) ;
return r ;
}
diff --git a/src/libs6rc/s6rc_read_uint.c b/src/libs6rc/s6rc_read_uint.c
index 1f148ac..c694f0d 100644
--- a/src/libs6rc/s6rc_read_uint.c
+++ b/src/libs6rc/s6rc_read_uint.c
@@ -11,7 +11,7 @@ int s6rc_read_uint (char const *file, unsigned int *u)
{
char buf[UINT_FMT + 1] ;
ssize_t r = openreadnclose(file, buf, UINT_FMT) ;
- if (r < 0) return (errno == ENOENT) ? 0 : -1 ;
+ if (r == -1) return (errno == ENOENT) ? 0 : -1 ;
buf[byte_chr(buf, r, '\n')] = 0 ;
if (!uint0_scan(buf, u)) return (errno = EINVAL, -1) ;
return 1 ;
diff --git a/src/s6-rc/s6-rc-compile.c b/src/s6-rc/s6-rc-compile.c
index cf9d62b..68b80c9 100644
--- a/src/s6-rc/s6-rc-compile.c
+++ b/src/s6-rc/s6-rc-compile.c
@@ -366,8 +366,8 @@ static uint32_t read_timeout (int dfd, char const *srcdir, char const *name, cha
{
char buf[64] ;
uint32_t timeout = 0 ;
- size_t r = openreadnclose_at(dfd, tname, buf, 63) ;
- if (!r)
+ ssize_t r = openreadnclose_at(dfd, tname, buf, 63) ;
+ if (r == -1)
{
if (errno && errno != ENOENT)
strerr_diefu6sys(111, "read ", srcdir, "/", name, "/", tname) ;
@@ -528,10 +528,10 @@ static inline void add_bundle (before_t *be, int dfd, char const *srcdir, char c
static inline void add_source (before_t *be, int dfd, char const *srcdir, char const *name)
{
char typestr[8] = "" ;
- size_t r ;
+ ssize_t r ;
if (verbosity >= 2) strerr_warni4x("parsing ", srcdir, "/", name) ;
r = openreadnclose_at(dfd, "type", typestr, 8) ;
- if (!r)
+ if (r == -1)
{
if (!errno) errno = EINVAL ;
strerr_diefu5sys(111, "read ", srcdir, "/", name, "/type") ;
diff --git a/src/s6-rc/s6-rc-update.c b/src/s6-rc/s6-rc-update.c
index 209e0f0..6f896a2 100644
--- a/src/s6-rc/s6-rc-update.c
+++ b/src/s6-rc/s6-rc-update.c
@@ -672,7 +672,8 @@ int main (int argc, char const *const *argv, char const *const *envp)
memcpy(dbfn + livelen + 1, "state", 6) ;
{
ssize_t rr = openreadnclose(dbfn, (char *)oldstate, oldn) ;
- if (rr != oldn) strerr_diefu2sys(111, "read ", dbfn) ;
+ if (rr == -1) strerr_diefu2sys(111, "read ", dbfn) ;
+ if (rr < oldn) strerr_diefu2x(4, "read valid db in ", dbfn) ;
}
r = oldn ;
while (r--) oldstate[r] &= 1 ;
diff --git a/src/s6-rc/s6-rc.c b/src/s6-rc/s6-rc.c
index 4fedee4..d99d6aa 100644
--- a/src/s6-rc/s6-rc.c
+++ b/src/s6-rc/s6-rc.c
@@ -565,7 +565,8 @@ int main (int argc, char const *const *argv)
memcpy(dbfn + livelen + 1, "state", 6) ;
{
ssize_t r = openreadnclose(dbfn, (char *)state, n) ;
- if (r != n) strerr_diefu2sys(111, "read ", dbfn) ;
+ if (r == -1) strerr_diefu2sys(111, "read ", dbfn) ;
+ if (r < n) strerr_diefu2x(4, "read valid db in ", dbfn) ;
{
unsigned int i = n ;
while (i--) state[i] &= 1 ;