From 0264df40be306e5375fe1ae5ad2eda56f6405cae Mon Sep 17 00:00:00 2001
From: Laurent Bercot <ska-skaware@skarnet.org>
Date: Mon, 1 Jun 2020 00:18:40 +0000
Subject:  Nothing to see here, just prepare for 2.2.2.4

---
 AUTHORS                    | 1 +
 NEWS                       | 7 +++++++
 doc/index.html             | 2 +-
 doc/upgrade.html           | 6 ++++++
 package/info               | 2 +-
 src/skaembutils/s6-mkdir.c | 6 ++++--
 6 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/AUTHORS b/AUTHORS
index 7a32257..2c9216b 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -11,3 +11,4 @@ Thanks to:
   Vallo Kallaste <kalts@estpak.ee>
   Josuah Demangeon <mail@josuah.net>
   Eric Vidal <eric@obarun.org>
+  Colin Booth <colin@heliocat.net>
diff --git a/NEWS b/NEWS
index e408743..e7077f5 100644
--- a/NEWS
+++ b/NEWS
@@ -1,5 +1,12 @@
 Changelog for s6-portable-utils.
 
+In 2.2.2.4
+----------
+
+ - Bugfixes of the bugs introduced in the previous bugfixes
+(that's what all software development is about, isn't it?)
+
+
 In 2.2.2.3
 ----------
 
diff --git a/doc/index.html b/doc/index.html
index f80727f..4201355 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.3.tar.gz">2.2.2.3</a>. </li>
+<a href="s6-portable-utils-2.2.2.4.tar.gz">2.2.2.4</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 91af8d0..eab91b0 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.4 </h2>
+
+<ul>
+ <li> Bugfix release, no changes. </li>
+</ul>
+
 <h2> in 2.2.2.3 </h2>
 
 <ul>
diff --git a/package/info b/package/info
index fcb28f0..459ab1b 100644
--- a/package/info
+++ b/package/info
@@ -1,4 +1,4 @@
 package=s6-portable-utils
-version=2.2.2.3
+version=2.2.2.4
 category=admin
 package_macro_name=S6_PORTABLE_UTILS
diff --git a/src/skaembutils/s6-mkdir.c b/src/skaembutils/s6-mkdir.c
index 352669a..4d1d7b9 100644
--- a/src/skaembutils/s6-mkdir.c
+++ b/src/skaembutils/s6-mkdir.c
@@ -10,6 +10,7 @@
 #include <skalibs/strerr2.h>
 
 #define USAGE "s6-mkdir [ -p ] [ -v ] [ -m mode ] dir"
+#define dieusage() strerr_dieusage(100, USAGE)
 
 static int doit (char const *s, unsigned int mode, int verbose, int ee)
 {
@@ -54,6 +55,7 @@ int main (int argc, char const *const *argv)
   int parents = 0, verbose = 0 ;
   unsigned int mode = 0777 ;
   int e = 0 ;
+  int noumask = 0 ;
   PROG = "s6-mkdir" ;
   {
     subgetopt_t l = SUBGETOPT_ZERO ;
@@ -65,13 +67,13 @@ int main (int argc, char const *const *argv)
       {
         case 'p': parents = 1 ; break ;
         case 'v': verbose = 1 ; break ;
-        case 'm': if (uint_oscan(l.arg, &mode)) break ;
+        case 'm': if (!uint_oscan(l.arg, &mode)) dieusage() ; noumask = 1 ; break ;
         default : strerr_dieusage(100, USAGE) ;
       }
     }
     argc -= l.ind ; argv += l.ind ;
   }
-  umask(0) ;
+  if (noumask) umask(0) ;
   for ( ; *argv ; argv++)
     e |= parents ? doparents(*argv, mode, verbose) :
                    doit(*argv, mode, verbose, 1) ;
-- 
cgit v1.2.3