diff options
| -rw-r--r-- | AUTHORS | 1 | ||||
| -rw-r--r-- | INSTALL | 2 | ||||
| -rw-r--r-- | NEWS | 6 | ||||
| -rw-r--r-- | doc/index.html | 4 | ||||
| -rw-r--r-- | doc/upgrade.html | 6 | ||||
| -rw-r--r-- | package/info | 2 | ||||
| -rw-r--r-- | src/minutils/s6-ps.c | 15 |
7 files changed, 24 insertions, 12 deletions
@@ -4,6 +4,7 @@ Main author: Contributors: Eric Le Bihan <eric.le.bihan.dev@free.fr> Luis Ressel <aranea@aixah.de> + John Regan <john@jrjrtech.com> Thanks to: Dan J. Bernstein <djb@cr.yp.to> @@ -6,7 +6,7 @@ Build Instructions - A Linux-based system with a standard C development environment - GNU make version 3.81 or later - - skalibs version 2.7.0.0 or later: http://skarnet.org/software/skalibs/ + - skalibs version 2.8.0.0 or later: http://skarnet.org/software/skalibs/ This software is Linux-specific. It will run on a Linux kernel, version 3.5 or later. @@ -1,5 +1,11 @@ Changelog for s6-linux-utils. +In 2.5.0.1 +---------- + + - Build fix for clang. + + In 2.5.0.0 ---------- diff --git a/doc/index.html b/doc/index.html index 98e43a5..521bf0b 100644 --- a/doc/index.html +++ b/doc/index.html @@ -34,7 +34,7 @@ The Linux kernel must be 3.5 or later. </li> <li> GNU make, version 3.81 or later </li> <li> <a href="//skarnet.org/software/skalibs/">skalibs</a> version -2.7.0.0 or later. It's a build-time requirement. It's also a run-time +2.8.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> </ul> @@ -50,7 +50,7 @@ library. </li> <ul> <li> The current released version of s6-linux-utils is -<a href="s6-linux-utils-2.5.0.0.tar.gz">2.5.0.0</a>. </li> +<a href="s6-linux-utils-2.5.0.1.tar.gz">2.5.0.1</a>. </li> <li> Alternatively, you can checkout a copy of the <a href="//git.skarnet.org/cgi-bin/cgit.cgi/s6-linux-utils/">s6-linux-utils git repository</a>: diff --git a/doc/upgrade.html b/doc/upgrade.html index 426157c..cd0a5d3 100644 --- a/doc/upgrade.html +++ b/doc/upgrade.html @@ -18,6 +18,12 @@ <h1> What has changed in s6-linux-utils </h1> +<h2> in 2.5.0.1 </h2> + +<ul> + <li> skalibs dependency bumped to 2.8.0.0. </li> +</ul> + <h2> in 2.5.0.0 </h2> <ul> diff --git a/package/info b/package/info index 919a1fd..befde22 100644 --- a/package/info +++ b/package/info @@ -1,4 +1,4 @@ package=s6-linux-utils -version=2.5.0.0 +version=2.5.0.1 category=admin package_macro_name=S6_LINUX_UTILS diff --git a/src/minutils/s6-ps.c b/src/minutils/s6-ps.c index bba973b..d6a69a4 100644 --- a/src/minutils/s6-ps.c +++ b/src/minutils/s6-ps.c @@ -286,20 +286,19 @@ int main (int argc, char const *const *argv) /* Order the processes for display */ { - AVLTREEB_TYPE(n+1) pidtree ; - avltreeb_init(&pidtree, n+1, &pid_dtok, &uint32_cmp, p) ; + AVLTREEN_DECLARE_AND_INIT(pidtree, n+1, &pid_dtok, &uint32_cmp, p) ; for (i = 0 ; i < n ; i++) { if (needstat && !s6ps_statparse(p+i)) strerr_diefu1sys(111, "parse process stats") ; - if (!avltreeb_insert(&pidtree, i)) - strerr_diefu1sys(111, "avltreeb_insert") ; + if (!avltreen_insert(&pidtree, i)) + strerr_diefu1sys(111, "avltreen_insert") ; } - if (!avltreeb_insert(&pidtree, n)) - strerr_diefu1sys(111, "avltreeb_insert") ; + if (!avltreen_insert(&pidtree, n)) + strerr_diefu1sys(111, "avltreen_insert") ; - if (flagtree) s6ps_otree(p, n+1, &pidtree.info, orderedlist) ; - else avltreeb_iter_nocancel(&pidtree, avltreeb_totalsize(&pidtree), &fillo_notree, orderedlist) ; + if (flagtree) s6ps_otree(p, n+1, &pidtree, orderedlist) ; + else avltreen_iter_nocancel(&pidtree, avltreen_totalsize(&pidtree), &fillo_notree, orderedlist) ; } |