Module Name: src
Committed By: hgutch
Date: Sun Aug 28 10:48:17 UTC 2022
Modified Files:
src/bin/csh: csh.1
src/bin/expr: expr.1
src/external/bsd/flex/bin: flex.1
src/lib/libc/string: strlcpy.3
src/sbin/disklabel: disklabel.5
src/share/man/man4: unix.4
src/share/man/man4/man4.sun2: leds.4
src/share/man/man4/man4.sun3: leds.4
src/usr.bin/head: head.1
src/usr.bin/mkstr: mkstr.1
src/usr.bin/tail: tail.1
Log Message:
Change back various occurrences of \*[Le], \*[Ge] (less/greater equal)
and \*(ua (upwards arrow) to literal "<=", ">=" and "^" whenever
appropriate (e.g., in code examples).
To generate a diff of this commit:
cvs rdiff -u -r1.56 -r1.57 src/bin/csh/csh.1
cvs rdiff -u -r1.37 -r1.38 src/bin/expr/expr.1
cvs rdiff -u -r1.4 -r1.5 src/external/bsd/flex/bin/flex.1
cvs rdiff -u -r1.13 -r1.14 src/lib/libc/string/strlcpy.3
cvs rdiff -u -r1.30 -r1.31 src/sbin/disklabel/disklabel.5
cvs rdiff -u -r1.28 -r1.29 src/share/man/man4/unix.4
cvs rdiff -u -r1.10 -r1.11 src/share/man/man4/man4.sun2/leds.4
cvs rdiff -u -r1.13 -r1.14 src/share/man/man4/man4.sun3/leds.4
cvs rdiff -u -r1.14 -r1.15 src/usr.bin/head/head.1
cvs rdiff -u -r1.13 -r1.14 src/usr.bin/mkstr/mkstr.1
cvs rdiff -u -r1.20 -r1.21 src/usr.bin/tail/tail.1
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/bin/csh/csh.1
diff -u src/bin/csh/csh.1:1.56 src/bin/csh/csh.1:1.57
--- src/bin/csh/csh.1:1.56 Sat Jul 9 21:19:44 2022
+++ src/bin/csh/csh.1 Sun Aug 28 10:48:15 2022
@@ -1,4 +1,4 @@
-.\" $NetBSD: csh.1,v 1.56 2022/07/09 21:19:44 uwe Exp $
+.\" $NetBSD: csh.1,v 1.57 2022/08/28 10:48:15 hgutch Exp $
.\"
.\" Copyright (c) 1980, 1990, 1993
.\" The Regents of the University of California. All rights reserved.
@@ -476,7 +476,7 @@ nest.)
This `!' may be preceded by a `\e' to prevent its special meaning; for
convenience, an `!' is passed unchanged when it is followed by a blank,
tab, newline, `=' or `('.
-(History substitutions also occur when an input line begins with `\*(ua'.
+(History substitutions also occur when an input line begins with `^'.
This special abbreviation will be described later.)
Any input line that contains history substitution is echoed on the terminal
before it is executed as it would have been typed without history substitution.
@@ -530,7 +530,7 @@ first (command) word
.It Ar n
.Ar n Ns 'th
argument
-.It \*(ua
+.It ^
first argument, i.e., `1'
.It $
last argument
@@ -544,7 +544,7 @@ range of words
abbreviates
.Ar `\&0\-y\'
.It *
-abbreviates `\*(ua\-$', or nothing if only 1 word in event
+abbreviates `^\-$', or nothing if only 1 word in event
.It Ar x*
abbreviates
.Ar `x\-$\'
@@ -555,7 +555,7 @@ but omitting word `$'
.El
.Pp
The `:' separating the event specification from the word designator
-can be omitted if the argument selector begins with a `\*(ua', `$', `*',
+can be omitted if the argument selector begins with a `^', `$', `*',
`\-' or `%'.
After the optional word designator can be
placed a sequence of modifiers, each preceded by a `:'.
@@ -624,14 +624,14 @@ A history reference may be given without
Here, the reference is to the previous command unless a previous
history reference occurred on the same line in which case this form repeats
the previous reference.
-Thus `!?foo?\*(ua !$' gives the first and last arguments
+Thus `!?foo?^ !$' gives the first and last arguments
from the command matching `?foo?'.
.Pp
A special abbreviation of a history reference occurs when the first
-non-blank character of an input line is a `\*(ua'.
-This is equivalent to `!:s\*(ua' providing a convenient
+non-blank character of an input line is a `^'.
+This is equivalent to `!:s^' providing a convenient
shorthand for substitutions on the text of the previous line.
-Thus `\*(ualb\*(ualib' fixes the spelling of
+Thus `^lb^lib' fixes the spelling of
`lib'
in the previous command.
Finally, a history substitution may be surrounded with `{' and `}'
@@ -669,7 +669,7 @@ left unchanged.
.Pp
Thus if the alias for `ls' is `ls \-l' the command `ls /usr' would map to
`ls \-l /usr', the argument list here being undisturbed.
-Similarly if the alias for `lookup' was `grep !\*(ua /etc/passwd' then
+Similarly if the alias for `lookup' was `grep !^ /etc/passwd' then
`lookup bill' would map to `grep bill /etc/passwd'.
.Pp
If an alias is found, the word transformation of the input text
@@ -987,12 +987,12 @@ and
commands.
The following operators are available:
.Bd -ragged -offset indent
-\&|\&| && \&| \*(ua & == != =~ !~ \*[Le] \*[Ge]
+\&|\&| && \&| ^ & == != =~ !~ <= >=
< > << >> + \- * / % ! ~ ( )
.Ed
.Pp
Here the precedence increases to the right,
-`==' `!=' `=~' and `!~', `\*[Le]' `\*[Ge]' `<'
+`==' `!=' `=~' and `!~', `<=' `>=' `<'
and `>', `<<' and `>>', `+' and `\-',
`*' `/' and `%' being, in groups, at the same level.
The `==' `!=' `=~' and `!~' operators compare their arguments as strings;
Index: src/bin/expr/expr.1
diff -u src/bin/expr/expr.1:1.37 src/bin/expr/expr.1:1.38
--- src/bin/expr/expr.1:1.37 Mon Jul 3 21:33:23 2017
+++ src/bin/expr/expr.1 Sun Aug 28 10:48:16 2022
@@ -1,4 +1,4 @@
-.\" $NetBSD: expr.1,v 1.37 2017/07/03 21:33:23 wiz Exp $
+.\" $NetBSD: expr.1,v 1.38 2022/08/28 10:48:16 hgutch Exp $
.\"
.\" Copyright (c) 2000,2003 The NetBSD Foundation, Inc.
.\" All rights reserved.
@@ -62,7 +62,7 @@ Returns the evaluation of
.Ar expr1
if neither expression evaluates to an empty string or zero;
otherwise, returns zero.
-.It Ar expr1 Li "{=, >, \*[Ge], <, \*[Le], !=}" Ar expr2
+.It Ar expr1 Li "{=, >, >=, <, <=, !=}" Ar expr2
Returns the results of integer comparison if both arguments are integers;
otherwise, returns the results of string comparison using the locale-specific
collation sequence.
Index: src/external/bsd/flex/bin/flex.1
diff -u src/external/bsd/flex/bin/flex.1:1.4 src/external/bsd/flex/bin/flex.1:1.5
--- src/external/bsd/flex/bin/flex.1:1.4 Wed Dec 1 21:44:12 2021
+++ src/external/bsd/flex/bin/flex.1 Sun Aug 28 10:48:16 2022
@@ -1,4 +1,4 @@
-.\" $NetBSD: flex.1,v 1.4 2021/12/01 21:44:12 wiz Exp $
+.\" $NetBSD: flex.1,v 1.5 2022/08/28 10:48:16 hgutch Exp $
.\"
.TH FLEX 1 "December 2021" "Version 2.5"
.SH NAME
@@ -939,7 +939,7 @@ to be rescanned enclosed in parentheses.
/* Copy yytext because unput() trashes yytext */
char *yycopy = strdup( yytext );
unput( ')' );
- for ( i = yyleng - 1; i \*[Ge] 0; --i )
+ for ( i = yyleng - 1; i >= 0; --i )
unput( yycopy[i] );
unput( '(' );
free( yycopy );
@@ -1769,7 +1769,7 @@ feature is discussed below):
\*[Lt]incl\*[Gt][ \\t]* /* eat the whitespace */
\*[Lt]incl\*[Gt][^ \\t\\n]+ { /* got the include file name */
- if ( include_stack_ptr \*[Ge] MAX_INCLUDE_DEPTH )
+ if ( include_stack_ptr >= MAX_INCLUDE_DEPTH )
{
fprintf( stderr, "Includes nested too deeply" );
exit( 1 );
Index: src/lib/libc/string/strlcpy.3
diff -u src/lib/libc/string/strlcpy.3:1.13 src/lib/libc/string/strlcpy.3:1.14
--- src/lib/libc/string/strlcpy.3:1.13 Wed Apr 14 13:07:51 2010
+++ src/lib/libc/string/strlcpy.3 Sun Aug 28 10:48:16 2022
@@ -1,4 +1,4 @@
-.\" $NetBSD: strlcpy.3,v 1.13 2010/04/14 13:07:51 wiz Exp $
+.\" $NetBSD: strlcpy.3,v 1.14 2022/08/28 10:48:16 hgutch Exp $
.\" from OpenBSD: strlcpy.3,v 1.11 2000/11/16 23:27:41 angelos Exp
.\"
.\" Copyright (c) 1998, 2000 Todd C. Miller <todd.mil...@courtesan.com>
@@ -160,9 +160,9 @@ char *dir, *file, pname[MAXPATHLEN];
\&...
-if (strlcpy(pname, dir, sizeof(pname)) \*[Ge] sizeof(pname))
+if (strlcpy(pname, dir, sizeof(pname)) >= sizeof(pname))
goto toolong;
-if (strlcat(pname, file, sizeof(pname)) \*[Ge] sizeof(pname))
+if (strlcat(pname, file, sizeof(pname)) >= sizeof(pname))
goto toolong;
.Ed
.Pp
Index: src/sbin/disklabel/disklabel.5
diff -u src/sbin/disklabel/disklabel.5:1.30 src/sbin/disklabel/disklabel.5:1.31
--- src/sbin/disklabel/disklabel.5:1.30 Mon Jul 3 21:33:41 2017
+++ src/sbin/disklabel/disklabel.5 Sun Aug 28 10:48:16 2022
@@ -1,4 +1,4 @@
-.\" $NetBSD: disklabel.5,v 1.30 2017/07/03 21:33:41 wiz Exp $
+.\" $NetBSD: disklabel.5,v 1.31 2022/08/28 10:48:16 hgutch Exp $
.\"
.\" Copyright (c) 1987, 1991, 1993
.\" The Regents of the University of California. All rights reserved.
@@ -121,7 +121,7 @@ is
/*
* The absolute maximum number of disk partitions allowed.
* This is the maximum value of MAXPARTITIONS for which 'struct disklabel'
- * is \*[Le] DEV_BSIZE bytes long. If MAXPARTITIONS is greater than this, beware.
+ * is <= DEV_BSIZE bytes long. If MAXPARTITIONS is greater than this, beware.
*/
#define MAXMAXPARTITIONS 22
#if MAXPARTITIONS > MAXMAXPARTITIONS
Index: src/share/man/man4/unix.4
diff -u src/share/man/man4/unix.4:1.28 src/share/man/man4/unix.4:1.29
--- src/share/man/man4/unix.4:1.28 Tue Jun 28 20:12:52 2022
+++ src/share/man/man4/unix.4 Sun Aug 28 10:48:16 2022
@@ -1,4 +1,4 @@
-.\" $NetBSD: unix.4,v 1.28 2022/06/28 20:12:52 rillig Exp $
+.\" $NetBSD: unix.4,v 1.29 2022/08/28 10:48:16 hgutch Exp $
.\"
.\" Copyright (c) 1991, 1993
.\" The Regents of the University of California. All rights reserved.
@@ -250,7 +250,7 @@ int ret;
memset(&addr, 0, sizeof(addr));
addr.sun_family = AF_LOCAL;
-if (strlen(pathname) \*[Ge] sizeof(addr.sun_path))
+if (strlen(pathname) >= sizeof(addr.sun_path))
goto too_long;
strncpy(addr.sun_path, pathname, sizeof(addr.sun_path));
ret = bind(s, (const struct sockaddr *)&addr, SUN_LEN(&addr));
Index: src/share/man/man4/man4.sun2/leds.4
diff -u src/share/man/man4/man4.sun2/leds.4:1.10 src/share/man/man4/man4.sun2/leds.4:1.11
--- src/share/man/man4/man4.sun2/leds.4:1.10 Mon Jul 3 21:30:59 2017
+++ src/share/man/man4/man4.sun2/leds.4 Sun Aug 28 10:48:16 2022
@@ -1,4 +1,4 @@
-.\" $NetBSD: leds.4,v 1.10 2017/07/03 21:30:59 wiz Exp $
+.\" $NetBSD: leds.4,v 1.11 2022/08/28 10:48:16 hgutch Exp $
.\"
.\" Copyright (c) 1997 The NetBSD Foundation, Inc.
.\" All rights reserved.
@@ -87,7 +87,7 @@ to display the repeating animation of a
of the display to the other, using six clock ticks between each update.
.Bd -ragged -offset indent
# echo 5 8 254 253 251 247 239 223 191 127 |
- awk '{ for (i=1;i\*[Le]NF;i++) printf("%c",$i+0); }' > /dev/leds
+ awk '{ for (i=1;i<=NF;i++) printf("%c",$i+0); }' > /dev/leds
.Ed
.Sh ERRORS
An I/O transfer to
Index: src/share/man/man4/man4.sun3/leds.4
diff -u src/share/man/man4/man4.sun3/leds.4:1.13 src/share/man/man4/man4.sun3/leds.4:1.14
--- src/share/man/man4/man4.sun3/leds.4:1.13 Mon Jul 3 21:30:59 2017
+++ src/share/man/man4/man4.sun3/leds.4 Sun Aug 28 10:48:16 2022
@@ -1,4 +1,4 @@
-.\" $NetBSD: leds.4,v 1.13 2017/07/03 21:30:59 wiz Exp $
+.\" $NetBSD: leds.4,v 1.14 2022/08/28 10:48:16 hgutch Exp $
.\"
.\" Copyright (c) 1997 The NetBSD Foundation, Inc.
.\" All rights reserved.
@@ -89,7 +89,7 @@ to display the repeating animation of a
of the display to the other, using six clock ticks between each update.
.Bd -ragged -offset indent
# echo 5 8 254 253 251 247 239 223 191 127 |
- awk '{ for (i=1;i\*[Le]NF;i++) printf("%c",$i+0); }' > /dev/leds
+ awk '{ for (i=1;i<=NF;i++) printf("%c",$i+0); }' > /dev/leds
.Ed
.Sh ERRORS
An I/O transfer to
Index: src/usr.bin/head/head.1
diff -u src/usr.bin/head/head.1:1.14 src/usr.bin/head/head.1:1.15
--- src/usr.bin/head/head.1:1.14 Tue Jul 4 06:59:34 2017
+++ src/usr.bin/head/head.1 Sun Aug 28 10:48:16 2022
@@ -1,4 +1,4 @@
-.\" $NetBSD: head.1,v 1.14 2017/07/04 06:59:34 wiz Exp $
+.\" $NetBSD: head.1,v 1.15 2022/08/28 10:48:16 hgutch Exp $
.\"
.\" Copyright (c) 1980, 1990, 1993
.\" The Regents of the University of California. All rights reserved.
@@ -58,7 +58,7 @@ counts bytes instead of lines.
If more than a single file is specified, or the
.Fl v
option is used, each file is preceded by a header consisting of the string
-.Dq ==> XXX \*[Le]=
+.Dq ==> XXX <==
where
.Dq XXX
is the name of the file.
Index: src/usr.bin/mkstr/mkstr.1
diff -u src/usr.bin/mkstr/mkstr.1:1.13 src/usr.bin/mkstr/mkstr.1:1.14
--- src/usr.bin/mkstr/mkstr.1:1.13 Mon Jul 3 21:34:20 2017
+++ src/usr.bin/mkstr/mkstr.1 Sun Aug 28 10:48:16 2022
@@ -1,4 +1,4 @@
-.\" $NetBSD: mkstr.1,v 1.13 2017/07/03 21:34:20 wiz Exp $
+.\" $NetBSD: mkstr.1,v 1.14 2022/08/28 10:48:16 hgutch Exp $
.\"
.\" Copyright (c) 1980, 1990, 1993
.\" The Regents of the University of California. All rights reserved.
@@ -111,7 +111,7 @@ oops:
exit 1 ;
}
}
- if (lseek(efil, a1, 0) < 0 || read(efil, buf, 256) \*[Le] 0)
+ if (lseek(efil, a1, 0) < 0 || read(efil, buf, 256) <= 0)
goto oops;
printf(buf, a2, a3, a4);
}
Index: src/usr.bin/tail/tail.1
diff -u src/usr.bin/tail/tail.1:1.20 src/usr.bin/tail/tail.1:1.21
--- src/usr.bin/tail/tail.1:1.20 Sun Oct 15 03:57:47 2017
+++ src/usr.bin/tail/tail.1 Sun Aug 28 10:48:17 2022
@@ -1,4 +1,4 @@
-.\" $NetBSD: tail.1,v 1.20 2017/10/15 03:57:47 pgoyette Exp $
+.\" $NetBSD: tail.1,v 1.21 2022/08/28 10:48:17 hgutch Exp $
.\"
.\" Copyright (c) 1980, 1990, 1991, 1993
.\" The Regents of the University of California. All rights reserved.
@@ -143,7 +143,7 @@ If more than a single file is specified,
.Fl v
option is used, each file is preceded by a
header consisting of the string
-.Dq ==> XXX \*[Le]=
+.Dq ==> XXX <==
where
.Dq XXX
is the name of the file.
