about summary refs log tree commit diff
diff options
context:
space:
mode:
authorLaurent Bercot <ska-skaware@skarnet.org>2020-06-13 13:19:57 +0000
committerLaurent Bercot <ska-skaware@skarnet.org>2020-06-13 13:19:57 +0000
commit13a02f2ccc602e8d038a0808b052f2bffc3f5408 (patch)
tree78be9d5c2b138f9c894dd034df68421319c6b22f
parent00807099924dc239a35685ee3e13c73723446f1a (diff)
downloads6-portable-utils-13a02f2ccc602e8d038a0808b052f2bffc3f5408.tar.gz
s6-portable-utils-13a02f2ccc602e8d038a0808b052f2bffc3f5408.tar.xz
s6-portable-utils-13a02f2ccc602e8d038a0808b052f2bffc3f5408.zip
bugfix: s6-unquote-filter (thanks W. Lund), prepare for 2.2.2.5
-rw-r--r--AUTHORS1
-rw-r--r--NEWS8
-rw-r--r--doc/index.html2
-rw-r--r--doc/upgrade.html6
-rw-r--r--package/info2
-rw-r--r--src/skaembutils/s6-unquote-filter.c2
6 files changed, 18 insertions, 3 deletions
diff --git a/AUTHORS b/AUTHORS
index 2c9216b..d871d46 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -3,6 +3,7 @@ Main author:
 
 Contributors:
   Luis Ressel <aranea@aixah.de>
+  Wictor Lund <wlund@iki.fi>
 
 Thanks to:
   Dan J. Bernstein <djb@cr.yp.to>
diff --git a/NEWS b/NEWS
index e7077f5..2fafcb3 100644
--- a/NEWS
+++ b/NEWS
@@ -1,5 +1,13 @@
 Changelog for s6-portable-utils.
 
+In 2.2.2.5
+----------
+
+ - Bugfixes that have nothing to do with 2.2.2.4 but that
+were reported *right after* 2.2.2.4 was released, because
+things do be like that
+
+
 In 2.2.2.4
 ----------
 
diff --git a/doc/index.html b/doc/index.html
index 4201355..157400a 100644
--- a/doc/index.html
+++ b/doc/index.html
@@ -77,7 +77,7 @@ library. </li>
 
 <ul>
  <li> The current released version of s6-portable-utils is
-<a href="s6-portable-utils-2.2.2.4.tar.gz">2.2.2.4</a>. </li>
+<a href="s6-portable-utils-2.2.2.5.tar.gz">2.2.2.5</a>. </li>
  <li> Alternatively, you can checkout a copy of the
 <a href="//git.skarnet.org/cgi-bin/cgit.cgi/s6-portable-utils/">s6-portable-utils
 git repository</a>:
diff --git a/doc/upgrade.html b/doc/upgrade.html
index eab91b0..270cea5 100644
--- a/doc/upgrade.html
+++ b/doc/upgrade.html
@@ -18,6 +18,12 @@
 
 <h1> What has changed in s6-portable-utils </h1>
 
+<h2> in 2.2.2.5 </h2>
+
+<ul>
+ <li> Bugfix release, no changes. </li>
+</ul>
+
 <h2> in 2.2.2.4 </h2>
 
 <ul>
diff --git a/package/info b/package/info
index 459ab1b..259da96 100644
--- a/package/info
+++ b/package/info
@@ -1,4 +1,4 @@
 package=s6-portable-utils
-version=2.2.2.4
+version=2.2.2.5
 category=admin
 package_macro_name=S6_PORTABLE_UTILS
diff --git a/src/skaembutils/s6-unquote-filter.c b/src/skaembutils/s6-unquote-filter.c
index edf2682..47a085c 100644
--- a/src/skaembutils/s6-unquote-filter.c
+++ b/src/skaembutils/s6-unquote-filter.c
@@ -46,7 +46,7 @@ static int doit (char const *s, size_t len)
       }
       return 1 ;
     }
-    if (!memchr(delim, delimlen, *s))
+    if (!memchr(delim, *s, delimlen))
     {
       switch (strictness)
       {