Adapt to skalibs-2.11.0.0

Signed-off-by: Laurent Bercot <ska@appnovation.com>

7 files changed, 54 insertions, 12 deletions

diff --git a/CONTRIBUTING b/CONTRIBUTING
new file mode 100644
index 0000000..6279422
--- /dev/null
+++ b/CONTRIBUTING
@@ -0,0 +1,5 @@
+ Please add a Signed-Off-By: line at the end of your commit,
+which certifies that you have the right and authority to pass
+it on as an open-source patch, as explicited in the Developer's
+Certificate of Origin available in this project's DCO file,
+or at https://developercertificate.org/
diff --git a/DCO b/DCO
new file mode 100644
index 0000000..8201f99
--- /dev/null
+++ b/DCO
@@ -0,0 +1,37 @@
+Developer Certificate of Origin
+Version 1.1
+
+Copyright (C) 2004, 2006 The Linux Foundation and its contributors.
+1 Letterman Drive
+Suite D4700
+San Francisco, CA, 94129
+
+Everyone is permitted to copy and distribute verbatim copies of this
+license document, but changing it is not allowed.
+
+
+Developer's Certificate of Origin 1.1
+
+By making a contribution to this project, I certify that:
+
+(a) The contribution was created in whole or in part by me and I
+    have the right to submit it under the open source license
+    indicated in the file; or
+
+(b) The contribution is based upon previous work that, to the best
+    of my knowledge, is covered under an appropriate open source
+    license and I have the right under that license to submit that
+    work with modifications, whether created in whole or in part
+    by me, under the same open source license (unless I am
+    permitted to submit under a different license), as indicated
+    in the file; or
+
+(c) The contribution was provided directly to me by some other
+    person who certified (a), (b) or (c) and I have not modified
+    it.
+
+(d) I understand and agree that this project and the contribution
+    are public and that a record of the contribution (including all
+    personal information I submit with it, including my sign-off) is
+    maintained indefinitely and may be redistributed consistent with
+    this project or the open source license(s) involved.
diff --git a/doc/index.html b/doc/index.html
index 57d596c..00ae5f8 100644
--- a/doc/index.html
+++ b/doc/index.html
@@ -140,7 +140,7 @@ the previous versions of s6-frontend and the current one. </li>
 
 <ul>
  <li> <tt>s6-frontend</tt> is discussed on the
-<a href="//skarnet.org/lists.html#supervision">supervision</a> mailing-list. </li>
+<a href="//skarnet.org/lists/#supervision">supervision</a> mailing-list. </li>
  <li> There is a <tt>#s6</tt> IRC channel on OFTC. Sometimes people
 are there and even answer questions. </li>
 </ul>
diff --git a/src/alias/s6-frontend-alias-chpst.c b/src/alias/s6-frontend-alias-chpst.c
index 05b3b07..5319ba6 100644
--- a/src/alias/s6-frontend-alias-chpst.c
+++ b/src/alias/s6-frontend-alias-chpst.c
@@ -154,7 +154,7 @@ int main (int argc, char const *const *argv)
   PROG = "s6-frontend-alias-chpst" ;
 
   {
-    subgetopt_t l = SUBGETOPT_ZERO ;
+    subgetopt l = SUBGETOPT_ZERO ;
     for (;;)
     {
       int opt = subgetopt_r(argc, argv, "vP012u:U:b:e:/:n:l:L:m:d:o:p:f:c:", &l) ;
diff --git a/src/alias/s6-frontend-alias-sv.c b/src/alias/s6-frontend-alias-sv.c
index 83ba177..8d2178b 100644
--- a/src/alias/s6-frontend-alias-sv.c
+++ b/src/alias/s6-frontend-alias-sv.c
@@ -20,14 +20,14 @@
 #define dieusage() strerr_dieusage(100, USAGE)
 #define dienomem() strerr_diefu1sys(111, "stralloc_catb")
 
-typedef int execfunc_t (char const *, char const *const *) ;
-typedef execfunc_t *execfunc_t_ref ;
+typedef int exec_func (char const *, char const *const *) ;
+typedef exec_func *exec_func_ref ;
 
 typedef struct info_s info_t, *info_t_ref ;
 struct info_s
 {
   char const *name ;
-  execfunc_t_ref f ;
+  exec_func_ref f ;
 } ;
 
 static int dowait = 0 ;
@@ -374,7 +374,7 @@ int main (int argc, char const *const *argv, char const *const *envp)
   }
 
   {
-    subgetopt_t l = SUBGETOPT_ZERO ;
+    subgetopt l = SUBGETOPT_ZERO ;
     for (;;)
     {
       int opt = subgetopt_r(argc, argv, "vw:", &l) ;
diff --git a/src/alias/s6-frontend-alias.c b/src/alias/s6-frontend-alias.c
index f786bba..89d7e39 100644
--- a/src/alias/s6-frontend-alias.c
+++ b/src/alias/s6-frontend-alias.c
@@ -22,15 +22,15 @@
 
 static unsigned int verbosity = 0 ;
 
-typedef void execfunc_t (int, char const *const *) ;
-typedef execfunc_t *execfunc_t_ref ;
+typedef void exec_func (int, char const *const *) ;
+typedef exec_func *exec_func_ref ;
 
 typedef struct info_s info_t, *info_t_ref ;
 struct info_s
 {
   char const *name ;
   char const *cmd ;
-  execfunc_t_ref f ;
+  exec_func_ref f ;
 } ;
 
 static int info_cmp (void const *a, void const *b)
@@ -92,7 +92,7 @@ static void runsvdir (int argc, char const *const *argv)
 {
   char const *newargv[4] = { S6_EXTBINPREFIX "s6-svscan", "-t14000", 0, 0 } ;
   int dosetsid = 0 ;
-  subgetopt_t l = SUBGETOPT_ZERO ;
+  subgetopt l = SUBGETOPT_ZERO ;
   for (;;)
   {
     int opt = subgetopt_r(argc, argv, "P", &l) ;
@@ -197,7 +197,7 @@ int main (int argc, char const **argv)
   if (!sabasename(&sa, name, strlen(name)) || !stralloc_0(&sa)) dienomem() ;
   if (!strcmp(sa.s, PROG))
   {
-    subgetopt_t l = SUBGETOPT_ZERO ;
+    subgetopt l = SUBGETOPT_ZERO ;
     for (;;)
     {
       int opt = subgetopt_r(argc, argv, "v", &l) ;
diff --git a/src/config/s6-frontend-config-preprocess.c b/src/config/s6-frontend-config-preprocess.c
index db09e24..e39ba84 100644
--- a/src/config/s6-frontend-config-preprocess.c
+++ b/src/config/s6-frontend-config-preprocess.c
@@ -265,7 +265,7 @@ int main (int argc, char const *const *argv, char const *const *envp)
 {
   PROG = "s6-frontend-config-preprocess" ;
   {
-    subgetopt_t l = SUBGETOPT_ZERO ;
+    subgetopt l = SUBGETOPT_ZERO ;
     for (;;)
     {
       int opt = subgetopt_r(argc, argv, "", &l) ;