From: schwarze <schwarze@openbsd.org>
Date: Fri, 29 Jul 2022 17:34:07 +0000 (+0000)
Subject: Improve the HISTORY sections of glob(7) and glob(3).
X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=f942c791086abf2997c7e1a44c092ad6ca50947a;p=openbsd

Improve the HISTORY sections of glob(7) and glob(3).

1. Make /etc/glob history less wordy and more precise: it was already in v1.

2. Remove the incorrect statement that the Bourne shell first integrated
globbing.  The PWB shell already did that in mid-1975, i.e. a least a few
months before Stephen R. Bourne started working on his shell, and the PWB
shell was publicly released with PWB/UNIX 1.0 about two years before v7.
For details, see
https://sjmulder.nl/dl/tuhs/Documentation/AUUGN/AUUGN-V06.6.pdf p. 39-40
OCR repost: https://groups.google.com/g/alt.folklore.computers/c/xW3ZgEnFoFs

From: mash@mips.UUCP (John Mashey)
Newsgroups: net.unix-wizards
Subject: Re: Shell history, true facts, but long
Date: 18 Mar 86 09:05:12 GMT
[...]
3) The "PWB Shell" first appeared in mid-1975.
[...]
4) The Bourne shell work started either in early 1976, or maybe late 1975.
[...]

In "The UNIX Shell", Stephen R. Bourne says:
"The design of the shell is based in part on the original UNIX shell
and the PWB/UNIX shell, some features having been taken from both."

3. Avoid the confusing statement that the glob() function first appeared
in 4.4BSD.  Actually, the PWB shell, the Bourne shell (in v7), the first
UCB shell (in 1BSD), and the C shell (in 2BSD) all contained internal
functions either called "glob()" or at least containing "glob" as a part
of their function name.

4. Be more precise regarding when the current functions first appeared:
they were already in Reno.

Joint work with and OK jsg@.
Feedback and OK jmc@.
---

diff --git a/lib/libc/gen/glob.3 b/lib/libc/gen/glob.3
index 69166a831bc..99e29082904 100644
--- a/lib/libc/gen/glob.3
+++ b/lib/libc/gen/glob.3
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: glob.3,v 1.37 2019/05/16 13:35:16 schwarze Exp $
+.\"	$OpenBSD: glob.3,v 1.38 2022/07/29 17:34:07 schwarze Exp $
 .\"
 .\" Copyright (c) 1989, 1991, 1993, 1994
 .\"	The Regents of the University of California.  All rights reserved.
@@ -29,7 +29,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: May 16 2019 $
+.Dd $Mdocdate: July 29 2022 $
 .Dt GLOB 3
 .Os
 .Sh NAME
@@ -472,12 +472,18 @@ and
 .Fa gl_flags
 should not be used by applications striving for strict standards conformance.
 .Sh HISTORY
+A stand-alone program,
+.Pa /etc/glob ,
+first appeared in
+.At v1 .
+In PWB/UNIX 1.0 this functionality was incorporated into the shell itself.
+.Pp
 The
 .Fn glob
 and
 .Fn globfree
-functions first appeared in
-.Bx 4.4 .
+functions in their current form first appeared in the C library of
+.Bx 4.3 Reno .
 .Sh CAVEATS
 On systems other than
 .Ox ,
diff --git a/share/man/man7/glob.7 b/share/man/man7/glob.7
index fc0f6431452..037cb52e438 100644
--- a/share/man/man7/glob.7
+++ b/share/man/man7/glob.7
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: glob.7,v 1.6 2019/01/25 00:19:26 millert Exp $
+.\"	$OpenBSD: glob.7,v 1.7 2022/07/29 17:34:07 schwarze Exp $
 .\"
 .\" Copyright (c) 2009 Todd C. Miller <millert@openbsd.org>
 .\"
@@ -15,7 +15,7 @@
 .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 .\"
 .\"
-.Dd $Mdocdate: January 25 2019 $
+.Dd $Mdocdate: July 29 2022 $
 .Dt GLOB 7
 .Os
 .Sh NAME
@@ -142,13 +142,8 @@ but not
 .Xr glob 3 ,
 .Xr re_format 7
 .Sh HISTORY
-In early versions of
-.Ux ,
-the shell did not do pattern expansion itself.
-A dedicated program,
+A stand-alone program,
 .Pa /etc/glob ,
-was used to perform the expansion and pass the results to a command.
-In
-.At v7 ,
-with the introduction of the Bourne shell,
-this functionality was incorporated into the shell itself.
+first appeared in
+.At v1 .
+In PWB/UNIX 1.0 this functionality was incorporated into the shell itself.