Prepare for 0.0.2.2; save/restore errno in safe wrappers

7 files changed, 23 insertions, 7 deletions

diff --git a/COPYING b/COPYING
index 6dbaa9b..903d68e 100644
--- a/COPYING
+++ b/COPYING
@@ -1,4 +1,4 @@
-Copyright (c) 2016-2025 Laurent Bercot <ska-skaware@skarnet.org>
+Copyright (c) 2016-2026 Laurent Bercot <ska-skaware@skarnet.org>
 
 Permission to use, copy, modify, and distribute this software for any
 purpose with or without fee is hereby granted, provided that the above
diff --git a/INSTALL b/INSTALL
index aac897c..ba9cbc6 100644
--- a/INSTALL
+++ b/INSTALL
@@ -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.14.5.0 or later: https://skarnet.org/software/skalibs/
+  - skalibs version 2.14.5.1 or later: https://skarnet.org/software/skalibs/
 
  This software is Linux-specific. It will run on a Linux kernel,
 version 2.6.32 or later. However, it is not hard to port to
diff --git a/NEWS b/NEWS
index fe6ea83..6238fed 100644
--- a/NEWS
+++ b/NEWS
@@ -1,5 +1,11 @@
 Changelog for bcnm
 
+In 0.0.2.2
+----------
+
+ - Bugfixes.
+
+
 In 0.0.2.1
 ----------
 
diff --git a/doc/index.html b/doc/index.html
index 55d9d12..913a218 100644
--- a/doc/index.html
+++ b/doc/index.html
@@ -50,7 +50,7 @@ certain state, and a comfortable C API to control
  <li> A Linux-based 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.14.5.0 or later. It's a build-time requirement. It's also a run-time
+2.14.5.1 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>
 
@@ -65,8 +65,8 @@ requirement if you link against the shared version of the skalibs library. </li>
 
 <ul>
  <li> The current released version of bcnm is
-<a href="bcnm-0.0.2.1.tar.gz">0.0.2.1</a>.
-You can access its checksum <a href="bcnm-0.0.2.1.tar.gz.sha256">here</a>. </li>
+<a href="bcnm-0.0.2.2.tar.gz">0.0.2.2</a>.
+You can access its checksum <a href="bcnm-0.0.2.2.tar.gz.sha256">here</a>. </li>
  <li> Alternatively, you can checkout a copy of the
 <a href="//git.skarnet.org/cgi-bin/cgit.cgi/bcnm/">bcnm
 git repository</a>:
diff --git a/doc/upgrade.html b/doc/upgrade.html
index 0d1eb3d..5a8ab88 100644
--- a/doc/upgrade.html
+++ b/doc/upgrade.html
@@ -18,6 +18,13 @@
 
 <h1> What has changed in bcnm </h1>
 
+<h2> in 0.0.2.2 </h2>
+
+<ul>
+ <li> <a href="//skarnet.org/software/skalibs/">skalibs</a>
+dependency bumped to 2.14.5.1. </li>
+</ul>
+
 <h2> in 0.0.2.1 </h2>
 
 <ul>
diff --git a/package/info b/package/info
index 95ed6fd..496df3e 100644
--- a/package/info
+++ b/package/info
@@ -1,4 +1,4 @@
 package=bcnm
-version=0.0.2.1
+version=0.0.2.2
 category=admin
 package_macro_name=BCNM
diff --git a/src/libwpactrl/wpactrl_fd_recv.c b/src/libwpactrl/wpactrl_fd_recv.c
index 9640b6c..f4134a3 100644
--- a/src/libwpactrl/wpactrl_fd_recv.c
+++ b/src/libwpactrl/wpactrl_fd_recv.c
@@ -2,9 +2,11 @@
 
 #include <skalibs/sysdeps.h>
 #include <skalibs/nonposix.h>
+
 #include <sys/socket.h>
 #include <sys/uio.h>
 #include <errno.h>
+
 #include <bcnm/wpactrl.h>
 #include "wpactrl-internal.h"
 
@@ -34,8 +36,9 @@ ssize_t wpactrl_fd_recv (int fd, char *s, size_t len)
     .msg_control = 0,
     .msg_controllen = 0
   } ;
+  int e = errno ;
   ssize_t r ;
   do r = recvmsg(fd, &msghdr, bsd_braindeadness_workaround_flags) ;
   while (r == -1 && errno == EINTR) ;
-  return r > 0 && msghdr.msg_flags & MSG_TRUNC ? (errno = EMSGSIZE, -1) : r ;
+  return r > 0 && msghdr.msg_flags & MSG_TRUNC ? (errno = EMSGSIZE, -1) : (errno = e, r) ;
 }