From bdd970fe719f78ba0b13446190ede748e3f8fb4d Mon Sep 17 00:00:00 2001
From: Laurent Bercot <ska-skaware@skarnet.org>
Date: Sat, 18 Jun 2016 18:11:53 +0000
Subject:  Revert backtick to a non-wrapper; add -I to backtick and withstdinas

---
 doc/backtick.html    | 27 +++++++++++++++++----------
 doc/withstdinas.html | 27 +++++++++++++++++----------
 2 files changed, 34 insertions(+), 20 deletions(-)

(limited to 'doc')

diff --git a/doc/backtick.html b/doc/backtick.html
index 6aa2f01..694a29d 100644
--- a/doc/backtick.html
+++ b/doc/backtick.html
@@ -46,20 +46,27 @@ output as a value. </li>
 <h2> Options </h2>
 
 <ul>
- <li> <tt>-i</tt>&nbsp;: insist. If <em>prog1</em> crashes or exits non-zero,
-<tt>backtick</tt> exits with an
-<a href="exitcodes.html">approximation</a> of the same exit code. </li>
- <li> <tt>-D&nbsp;<em>default</em></tt>&nbsp;: default value. If
-<em>prog1</em> crashes or exits non-zero, <em>default</em> is used as
-<em>variable</em>'s value. If neither the <tt>-i</tt> nor the <tt>-D</tt>
-option have been given, <tt>backtick</tt> execs into
-<em>prog2...</em> no matter what <em>prog1</em> does, with the null word as
-<em>variable</em>'s value if <em>prog1</em> didn't write anything before
-dying. </li>
  <li> <tt>-n</tt>&nbsp;: chomp an ending newline off <em>prog1...</em>'s
 output. </li>
 </ul>
 
+<p>
+ The other options tell backtick what to do if <em>prog1...</em>'s output
+is not suitable as the contents of an environment variable, i.e. it
+contains a null character:
+</p>
+
+<ul>
+ <li> <tt>-i</tt>&nbsp;: backtick exits 1. </li>
+ <li> <tt>-I</tt>&nbsp;: <em>variable</em> is <strong>removed</strong> from
+the environment, and execution proceeds. </li>
+ <li> <tt>-D&nbsp;<em>default</em></tt>&nbsp;: the value of <em>variable</em>
+is set to <em>default</em>, and execution proceeds. </li>
+ <li> neither of those options: the value of <em>variable</em> is set to whatever
+the start of <em>prog1...</em>'s output is, up to the first null character;
+then execution proceeds. </li>
+</ul>
+
 <h2> Notes </h2>
 
 <ul>
diff --git a/doc/withstdinas.html b/doc/withstdinas.html
index 29ad1b6..db49681 100644
--- a/doc/withstdinas.html
+++ b/doc/withstdinas.html
@@ -31,7 +31,7 @@ environment variable.
 </p>
 
 <pre>
-     withstdinas [ -i | -D <em>default</em> ] [ -n ] <em>variable</em> <em>prog...</em>
+     withstdinas [ -i | -I | -D <em>default</em> ] [ -n ] <em>variable</em> <em>prog...</em>
 </pre>
 
 <ul>
@@ -44,18 +44,25 @@ environment variable.
 <h2> Options </h2>
 
 <ul>
- <li> <tt>-i</tt>&nbsp;: insist. If the data on stdin is invalid as
-an environment variable, for instance if it contains a null
-character, <tt>withstdinas</tt> exits 1. </li>
- <li> <tt>-D&nbsp;<em>default</em></tt>&nbsp;: default value.
-If the data on stdin is invalid, <em>default</em> is used as
-<em>variable</em>'s value. If neither the <tt>-i</tt> nor the <tt>-D</tt>
-option have been given, <tt>withstdinas</tt> execs into
-<em>prog...</em> with <em>variable</em> containing whatever value could be read on stdin,
-cut before the first null character. </li>
  <li> <tt>-n</tt>&nbsp;: chomp an ending newline off stdin. </li>
 </ul>
 
+<p>
+ The other options tell withstdinas what to do if its input is
+not suitable as the contents of an environment variable, i.e. it
+contains a null character:
+</p>
+
+<ul>
+ <li> <tt>-i</tt>&nbsp;: withstdinas exits 1. </li>
+ <li> <tt>-I</tt>&nbsp;: <em>variable</em> is <strong>removed</strong> from
+the environment, and execution proceeds. </li>
+ <li> <tt>-D&nbsp;<em>default</em></tt>&nbsp;: the value of <em>variable</em>
+is set to <em>default</em>, and execution proceeds. </li>
+ <li> neither of those options:  the value of <em>variable</em> is set to whatever the
+start of the input is, up to the first null character; and execution proceeds. </li>
+</ul>
+
 <h2> Notes </h2>
 
 <ul>
-- 
cgit v1.2.3