From 2d0e823aa9f574fa0291f716c8a7e45bafe464d3 Mon Sep 17 00:00:00 2001
From: Laurent Bercot
Date: Wed, 3 Jul 2019 15:50:50 +0000
Subject: Update doc to reflect the removal of s6-fdholder-*c programs
---
doc/libs6/s6-fdholder.html | 3 +-
doc/s6-fdholder-delete.html | 35 ++++++++------
doc/s6-fdholder-deletec.html | 64 -------------------------
doc/s6-fdholder-getdump.html | 64 +++++++++++++++++--------
doc/s6-fdholder-getdumpc.html | 96 --------------------------------------
doc/s6-fdholder-list.html | 25 +++++++---
doc/s6-fdholder-listc.html | 69 ---------------------------
doc/s6-fdholder-retrieve.html | 41 ++++++++--------
doc/s6-fdholder-retrievec.html | 69 ---------------------------
doc/s6-fdholder-setdump.html | 30 +++++++-----
doc/s6-fdholder-setdumpc.html | 67 --------------------------
doc/s6-fdholder-store.html | 32 +++++++------
doc/s6-fdholder-storec.html | 69 ---------------------------
doc/s6-fdholder-transferdump.html | 47 +++++++++++++++----
doc/s6-fdholder-transferdumpc.html | 84 ---------------------------------
doc/s6-fdholderd.html | 16 +++----
doc/upgrade.html | 2 +-
17 files changed, 188 insertions(+), 625 deletions(-)
delete mode 100644 doc/s6-fdholder-deletec.html
delete mode 100644 doc/s6-fdholder-getdumpc.html
delete mode 100644 doc/s6-fdholder-listc.html
delete mode 100644 doc/s6-fdholder-retrievec.html
delete mode 100644 doc/s6-fdholder-setdumpc.html
delete mode 100644 doc/s6-fdholder-storec.html
delete mode 100644 doc/s6-fdholder-transferdumpc.html
diff --git a/doc/libs6/s6-fdholder.html b/doc/libs6/s6-fdholder.html
index 0a2413b..6aabe39 100644
--- a/doc/libs6/s6-fdholder.html
+++ b/doc/libs6/s6-fdholder.html
@@ -35,11 +35,10 @@ exact function prototypes.
A programming example
- The src/fdholder/s6-fdholder-*c.c files in the s6 package,
+ The src/fdholder/s6-fdholder-*.c files in the s6 package,
for instance, illustrate how to use the s6-fdholder library.
-
Synchronous functions with a specified maximum execution time
diff --git a/doc/s6-fdholder-delete.html b/doc/s6-fdholder-delete.html
index 7809ca2..89e29c7 100644
--- a/doc/s6-fdholder-delete.html
+++ b/doc/s6-fdholder-delete.html
@@ -32,18 +32,11 @@ daemon storage.
- - s6-fdholder-delete executes into s6-ipcclient path
-s6-fdholder-deletec id .
-It does nothing else: it is just a convenience program.
-The s6-ipcclient program connects
-to a Unix socket at path, and the
-s6-fdholder-deletec program
-sends instruction to the server.
- - It should be used to connect to a
-s6-fdholderd daemon, which will receive
-the instruction to close and remove the file descriptor identified
-by id.
- - It then exits 0.
+ - s6-fdholder-delete connects to a
+s6-fdholderd server process listening on
+path.
+ - It tells the server to close the file descriptor that has been
+stored with identifier id.
Options
@@ -56,6 +49,18 @@ only here to protect users against programming errors (connecting to the
wrong socket, for instance).
+ Exit codes
+
+
+ - 0: success.
+ - 1: the server denied the operation. The meaning of the error messages
+is explained here.
+ - 100: wrong usage.
+ - 111: system call failed - that includes attempting to connect to a
+nonexistent socket, or one where no s6-fdholderd
+daemon is listening.
+
+
Usage example
@@ -63,9 +68,9 @@ wrong socket, for instance).
- will tell a
-s6-fdholderd daemon listening on the /service/fdholderd/s
-socket to close the filedescriptor identified as MYSOCKET.
+will tell a s6-fdholderd daemon listening on the
+/service/fdholderd/s socket to close the file descriptor
+dentified as MYSOCKET.
-
-
-s6
-Software
-skarnet.org
-
-
- The s6-fdholder-deletec program
-
-
-s6-fdholder-deletec talks to a
-fd-holding daemon on its open
-descriptors 6 and 7, and tells it to close a file descriptor
-it's currently holding.
-
-
- Interface
-
-
- s6-fdholder-deletec [ -t timeout ] id
-
-
-
- - s6-fdholder-deletec expects to talk to a listening
-s6-fdholderd program on its descriptors 6 and 7.
- - It tells the server to close the file descriptor that has been
-stored with identifier id.
- - It then exits 0, or 1 if the server returned an error.
-
-
- Options
-
-
-- -t timeout : if the operation cannot be
-processed in timeout milliseconds, then fail with an error message.
-Communications with the server should be near-instant, so this option is
-only here to protect users against programming errors.
-
-
- Notes
-
-
- - s6-fdholder-deletec is the "internal" version of
-s6-fdholder-delete. It simply
-expects to be run as a UCSPI client, i.e. talking to the server
-over descriptors 6 and 7, instead of connecting to the server
-itself.
- - The error messages for the s6-fdholder suite are explained
-here.
-
-
-
diff --git a/doc/s6-fdholder-deletec.html b/doc/s6-fdholder-deletec.html
deleted file mode 100644
index 3bc5a8a..0000000
--- a/doc/s6-fdholder-deletec.html
+++ /dev/null
@@ -1,64 +0,0 @@
-
-