Module Name: src
Committed By: wiz
Date: Thu Dec 16 17:42:29 UTC 2010
Modified Files:
src/external/bsd/libarchive/dist/libarchive: archive_entry.3
src/external/bsd/pcc/dist/pcc: configure.ac
src/external/bsd/pcc/dist/pcc/cc/ccom: scan.l
src/external/bsd/tre/dist/doc: tre-api.html
src/external/gpl3/binutils/dist/binutils/doc: strings.1
src/gnu/dist/gcc4/gcc: c-format.c
src/gnu/dist/gcc4/gcc/doc: cpp.texi implement-c.texi
src/lib/libc/locale: _wcstod.h mbsrtowcs.3 mbstowcs.3 wcscoll.3
wcsrtombs.3 wcstol.3 wcstombs.3 wcsxfrm.3
src/lib/libc/stdio: fgetwln.3 fgetws.3 fputws.3 getwc.3 printf.3
putwc.3 ungetwc.3 vfscanf.c vfwprintf.c wprintf.3 wscanf.3
src/lib/libc/string: wcscasecmp.3 wcsdup.3 wcstok.3 wmemchr.3
src/lib/libcurses: addbytes.c cchar.c curses.h curses_private.h
get_wch.c ins_wstr.c
src/lib/libedit: chartype.h editline.3
src/share/doc/smm/01.setup: 3.t
src/share/man/man0: title.cdrom title.urm
src/usr.bin/xlint/lint1: scan.l
src/usr.sbin/chrtbl: chrtbl.8
Log Message:
Observe the following spelling:
- wide character (noun)
- wide-character (adjective)
Inspired by j...@openbsd.
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r1.2 \
src/external/bsd/libarchive/dist/libarchive/archive_entry.3
cvs rdiff -u -r1.1.1.3 -r1.2 src/external/bsd/pcc/dist/pcc/configure.ac
cvs rdiff -u -r1.1.1.3 -r1.2 src/external/bsd/pcc/dist/pcc/cc/ccom/scan.l
cvs rdiff -u -r1.1.1.1 -r1.2 src/external/bsd/tre/dist/doc/tre-api.html
cvs rdiff -u -r1.2 -r1.3 \
src/external/gpl3/binutils/dist/binutils/doc/strings.1
cvs rdiff -u -r1.1.1.1 -r1.2 src/gnu/dist/gcc4/gcc/c-format.c
cvs rdiff -u -r1.5 -r1.6 src/gnu/dist/gcc4/gcc/doc/cpp.texi
cvs rdiff -u -r1.1.1.2 -r1.2 src/gnu/dist/gcc4/gcc/doc/implement-c.texi
cvs rdiff -u -r1.1 -r1.2 src/lib/libc/locale/_wcstod.h
cvs rdiff -u -r1.11 -r1.12 src/lib/libc/locale/mbsrtowcs.3 \
src/lib/libc/locale/wcstombs.3
cvs rdiff -u -r1.10 -r1.11 src/lib/libc/locale/mbstowcs.3
cvs rdiff -u -r1.2 -r1.3 src/lib/libc/locale/wcscoll.3 \
src/lib/libc/locale/wcstol.3
cvs rdiff -u -r1.12 -r1.13 src/lib/libc/locale/wcsrtombs.3
cvs rdiff -u -r1.3 -r1.4 src/lib/libc/locale/wcsxfrm.3
cvs rdiff -u -r1.1 -r1.2 src/lib/libc/stdio/fgetwln.3
cvs rdiff -u -r1.2 -r1.3 src/lib/libc/stdio/fgetws.3 \
src/lib/libc/stdio/fputws.3 src/lib/libc/stdio/wscanf.3
cvs rdiff -u -r1.8 -r1.9 src/lib/libc/stdio/getwc.3 \
src/lib/libc/stdio/putwc.3
cvs rdiff -u -r1.54 -r1.55 src/lib/libc/stdio/printf.3
cvs rdiff -u -r1.7 -r1.8 src/lib/libc/stdio/ungetwc.3 \
src/lib/libc/stdio/wprintf.3
cvs rdiff -u -r1.40 -r1.41 src/lib/libc/stdio/vfscanf.c
cvs rdiff -u -r1.22 -r1.23 src/lib/libc/stdio/vfwprintf.c
cvs rdiff -u -r1.2 -r1.3 src/lib/libc/string/wcscasecmp.3 \
src/lib/libc/string/wcsdup.3
cvs rdiff -u -r1.5 -r1.6 src/lib/libc/string/wcstok.3
cvs rdiff -u -r1.14 -r1.15 src/lib/libc/string/wmemchr.3
cvs rdiff -u -r1.37 -r1.38 src/lib/libcurses/addbytes.c
cvs rdiff -u -r1.4 -r1.5 src/lib/libcurses/cchar.c
cvs rdiff -u -r1.100 -r1.101 src/lib/libcurses/curses.h
cvs rdiff -u -r1.45 -r1.46 src/lib/libcurses/curses_private.h
cvs rdiff -u -r1.8 -r1.9 src/lib/libcurses/get_wch.c
cvs rdiff -u -r1.5 -r1.6 src/lib/libcurses/ins_wstr.c
cvs rdiff -u -r1.6 -r1.7 src/lib/libedit/chartype.h
cvs rdiff -u -r1.73 -r1.74 src/lib/libedit/editline.3
cvs rdiff -u -r1.4 -r1.5 src/share/doc/smm/01.setup/3.t
cvs rdiff -u -r1.6 -r1.7 src/share/man/man0/title.cdrom
cvs rdiff -u -r1.8 -r1.9 src/share/man/man0/title.urm
cvs rdiff -u -r1.47 -r1.48 src/usr.bin/xlint/lint1/scan.l
cvs rdiff -u -r1.8 -r1.9 src/usr.sbin/chrtbl/chrtbl.8
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/libarchive/dist/libarchive/archive_entry.3
diff -u src/external/bsd/libarchive/dist/libarchive/archive_entry.3:1.1.1.1 src/external/bsd/libarchive/dist/libarchive/archive_entry.3:1.2
--- src/external/bsd/libarchive/dist/libarchive/archive_entry.3:1.1.1.1 Fri Sep 19 21:56:14 2008
+++ src/external/bsd/libarchive/dist/libarchive/archive_entry.3 Thu Dec 16 17:42:25 2010
@@ -336,11 +336,11 @@
In the case of strings, a const-qualified pointer to
the string is returned.
.El
-String data can be set or accessed as wide character strings
+String data can be set or accessed as wide-character strings
or normal
.Va char
strings.
-The functions that use wide character strings are suffixed with
+The functions that use wide-character strings are suffixed with
.Cm _w .
Note that these are different representations of the same data:
For example, if you store a narrow string and read the corresponding
Index: src/external/bsd/pcc/dist/pcc/configure.ac
diff -u src/external/bsd/pcc/dist/pcc/configure.ac:1.1.1.3 src/external/bsd/pcc/dist/pcc/configure.ac:1.2
--- src/external/bsd/pcc/dist/pcc/configure.ac:1.1.1.3 Thu Jun 3 18:57:06 2010
+++ src/external/bsd/pcc/dist/pcc/configure.ac Thu Dec 16 17:42:26 2010
@@ -316,7 +316,7 @@
fi
AC_DEFINE_UNQUOTED(WCHAR_TYPE, $wchar_type, [Type to use for wide characters])
-AC_DEFINE_UNQUOTED(WCHAR_SIZE, $wchar_size, [Size of wide character type])
+AC_DEFINE_UNQUOTED(WCHAR_SIZE, $wchar_size, [Size of wide-character type])
# check for additional compiler flags
AC_PROG_CC
Index: src/external/bsd/pcc/dist/pcc/cc/ccom/scan.l
diff -u src/external/bsd/pcc/dist/pcc/cc/ccom/scan.l:1.1.1.3 src/external/bsd/pcc/dist/pcc/cc/ccom/scan.l:1.2
--- src/external/bsd/pcc/dist/pcc/cc/ccom/scan.l:1.1.1.3 Thu Jun 3 18:57:43 2010
+++ src/external/bsd/pcc/dist/pcc/cc/ccom/scan.l Thu Dec 16 17:42:26 2010
@@ -1,6 +1,6 @@
%{
/* Id: scan.l,v 1.91 2010/05/21 19:37:32 ragge Exp */
-/* $NetBSD: scan.l,v 1.1.1.3 2010/06/03 18:57:43 plunky Exp $ */
+/* $NetBSD: scan.l,v 1.2 2010/12/16 17:42:26 wiz Exp $ */
/*
* Copyright (c) 2002 Anders Magnusson. All rights reserved.
@@ -527,9 +527,9 @@
}
if (i == 0)
- uerror("empty wide character constant");
+ uerror("empty wide-character constant");
if (i > 1)
- werror("too many characters in wide character constant");
+ werror("too many characters in wide-character constant");
return xbcon(lastcon, NULL, ctype(UNSIGNED));
}
Index: src/external/bsd/tre/dist/doc/tre-api.html
diff -u src/external/bsd/tre/dist/doc/tre-api.html:1.1.1.1 src/external/bsd/tre/dist/doc/tre-api.html:1.2
--- src/external/bsd/tre/dist/doc/tre-api.html:1.1.1.1 Thu Feb 25 07:33:18 2010
+++ src/external/bsd/tre/dist/doc/tre-api.html Thu Dec 16 17:42:26 2010
@@ -58,8 +58,8 @@
null bytes. The <tt><font class="func">regwcomp</font>()</tt> and
<tt><font class="func">regwncomp</font>()</tt> functions work like
<tt><font class="func">regcomp</font>()</tt> and <tt><font
-class="func">regncomp</font>()</tt>, respectively, but take a wide
-character (<tt><font class="type">wchar_t</font></tt>) string
+class="func">regncomp</font>()</tt>, respectively, but take a
+wide-character (<tt><font class="type">wchar_t</font></tt>) string
instead of a byte string.
</p>
Index: src/external/gpl3/binutils/dist/binutils/doc/strings.1
diff -u src/external/gpl3/binutils/dist/binutils/doc/strings.1:1.2 src/external/gpl3/binutils/dist/binutils/doc/strings.1:1.3
--- src/external/gpl3/binutils/dist/binutils/doc/strings.1:1.2 Fri Nov 20 22:51:29 2009
+++ src/external/gpl3/binutils/dist/binutils/doc/strings.1 Thu Dec 16 17:42:26 2010
@@ -208,7 +208,7 @@
characters (\s-1ASCII\s0, \s-1ISO\s0 8859, etc., default), \fBS\fR =
single\-8\-bit\-byte characters, \fBb\fR = 16\-bit bigendian, \fBl\fR =
16\-bit littleendian, \fBB\fR = 32\-bit bigendian, \fBL\fR = 32\-bit
-littleendian. Useful for finding wide character strings. (\fBl\fR
+littleendian. Useful for finding wide-character strings. (\fBl\fR
and \fBb\fR apply to, for example, Unicode \s-1UTF\-16/UCS\-2\s0 encodings).
.IP "\fB\-T\fR \fIbfdname\fR" 4
.IX Item "-T bfdname"
Index: src/gnu/dist/gcc4/gcc/c-format.c
diff -u src/gnu/dist/gcc4/gcc/c-format.c:1.1.1.1 src/gnu/dist/gcc4/gcc/c-format.c:1.2
--- src/gnu/dist/gcc4/gcc/c-format.c:1.1.1.1 Thu Apr 20 08:37:00 2006
+++ src/gnu/dist/gcc4/gcc/c-format.c Thu Dec 16 17:42:26 2010
@@ -1250,7 +1250,7 @@
format_types[info->format_type].name);
if (res.number_wide > 0)
- warning (OPT_Wformat, "format is a wide character string");
+ warning (OPT_Wformat, "format is a wide-character string");
if (res.number_unterminated > 0)
warning (OPT_Wformat, "unterminated format string");
Index: src/gnu/dist/gcc4/gcc/doc/cpp.texi
diff -u src/gnu/dist/gcc4/gcc/doc/cpp.texi:1.5 src/gnu/dist/gcc4/gcc/doc/cpp.texi:1.6
--- src/gnu/dist/gcc4/gcc/doc/cpp.texi:1.5 Wed Nov 11 19:03:52 2009
+++ src/gnu/dist/gcc4/gcc/doc/cpp.texi Thu Dec 16 17:42:27 2010
@@ -272,7 +272,7 @@
The default is UTF-16 or UTF-32, whichever fits in the target's
@code{wchar_t} type, in the target machine's byte
ord...@footnote{utf-16 does not meet the requirements of the C
-standard for a wide character set, but the choice of 16-bit
+standard for a wide-character set, but the choice of 16-bit
@code{wchar_t} is enshrined in some system ABIs so we cannot fix
this.} Octal and hexadecimal escape sequences do not undergo
conversion; @t{'\x12'} has the value 0x12 regardless of the currently
Index: src/gnu/dist/gcc4/gcc/doc/implement-c.texi
diff -u src/gnu/dist/gcc4/gcc/doc/implement-c.texi:1.1.1.2 src/gnu/dist/gcc4/gcc/doc/implement-c.texi:1.2
--- src/gnu/dist/gcc4/gcc/doc/implement-c.texi:1.1.1.2 Thu Jan 11 02:39:51 2007
+++ src/gnu/dist/gcc4/gcc/doc/implement-c.texi Thu Dec 16 17:42:27 2010
@@ -161,7 +161,7 @@
behavior, cpp, The C Preprocessor}.
@item
-...@cite{the value of a wide character constant containing more than one
+...@cite{the value of a wide-character constant containing more than one
multibyte character, or containing a multibyte character or escape
sequence not represented in the extended execution character set (C90
6.1.3.4, C99 6.4.4.4).}
Index: src/lib/libc/locale/_wcstod.h
diff -u src/lib/libc/locale/_wcstod.h:1.1 src/lib/libc/locale/_wcstod.h:1.2
--- src/lib/libc/locale/_wcstod.h:1.1 Sat Apr 15 12:17:23 2006
+++ src/lib/libc/locale/_wcstod.h Thu Dec 16 17:42:27 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: _wcstod.h,v 1.1 2006/04/15 12:17:23 tnozaki Exp $ */
+/* $NetBSD: _wcstod.h,v 1.2 2010/12/16 17:42:27 wiz Exp $ */
/*-
* Copyright (c) 2002 Tim J. Robbins
@@ -46,7 +46,7 @@
*
* This is the wide-character counterpart of strto{f,d,ld}(). So that
* we do not have to duplicate the code of strto{f,d,ld}() here,
- * we convert the supplied wide character string to multibyte and
+ * we convert the supplied wide-character string to multibyte and
* call strto{f,d,ld}() on the result.
* This assumes that the multibyte encoding is compatible with ASCII
* for at least the digits, radix character and letters.
@@ -69,10 +69,10 @@
goto no_convert;
/*
- * Convert the supplied numeric wide char. string to multibyte.
+ * Convert the supplied numeric wide-char. string to multibyte.
*
* We could attempt to find the end of the numeric portion of the
- * wide char. string to avoid converting unneeded characters but
+ * wide-char. string to avoid converting unneeded characters but
* choose not to bother; optimising the uncommon case where
* the input string contains a lot of text after the number
* duplicates a lot of strto{f,d,ld}()'s functionality and
@@ -108,7 +108,7 @@
* We only know where the number ended in the _multibyte_
* representation of the string. If the caller wants to know
* where it ended, count multibyte characters to find the
- * corresponding position in the wide char string.
+ * corresponding position in the wide-char string.
*/
if (endptr != NULL)
/* XXX Assume each wide char is one byte. */
Index: src/lib/libc/locale/mbsrtowcs.3
diff -u src/lib/libc/locale/mbsrtowcs.3:1.11 src/lib/libc/locale/mbsrtowcs.3:1.12
--- src/lib/libc/locale/mbsrtowcs.3:1.11 Mon Oct 16 09:10:40 2006
+++ src/lib/libc/locale/mbsrtowcs.3 Thu Dec 16 17:42:27 2010
@@ -1,4 +1,4 @@
-.\" $NetBSD: mbsrtowcs.3,v 1.11 2006/10/16 09:10:40 wiz Exp $
+.\" $NetBSD: mbsrtowcs.3,v 1.12 2010/12/16 17:42:27 wiz Exp $
.\"
.\" Copyright (c)2002 Citrus Project,
.\" All rights reserved.
@@ -30,7 +30,7 @@
.\" ----------------------------------------------------------------------
.Sh NAME
.Nm mbsrtowcs
-.Nd converts a multibyte character string to a wide character string \
+.Nd converts a multibyte character string to a wide-character string \
(restartable)
.\" ----------------------------------------------------------------------
.Sh LIBRARY
@@ -47,7 +47,7 @@
.Fn mbsrtowcs
converts the multibyte character string indirectly pointed to by
.Fa s
-to the corresponding wide character string, and stores it in the
+to the corresponding wide-character string, and stores it in the
array pointed to by
.Fa pwcs .
The conversion stops due to the following reasons:
@@ -99,7 +99,7 @@
.It "s == NULL || *s == NULL"
Undefined (may cause the program to crash).
.It "pwcs == NULL"
-The conversion has taken place, but the resulting wide character string
+The conversion has taken place, but the resulting wide-character string
was discarded.
In this case, the pointer object pointed to by
.Fa s
@@ -136,7 +136,7 @@
.Dv NULL
and the value returned is equal to
.Fa n ,
-the wide character string pointed to by
+the wide-character string pointed to by
.Fa pwcs
is not nul-terminated.
If
Index: src/lib/libc/locale/wcstombs.3
diff -u src/lib/libc/locale/wcstombs.3:1.11 src/lib/libc/locale/wcstombs.3:1.12
--- src/lib/libc/locale/wcstombs.3:1.11 Mon Oct 16 08:42:16 2006
+++ src/lib/libc/locale/wcstombs.3 Thu Dec 16 17:42:27 2010
@@ -1,4 +1,4 @@
-.\" $NetBSD: wcstombs.3,v 1.11 2006/10/16 08:42:16 wiz Exp $
+.\" $NetBSD: wcstombs.3,v 1.12 2010/12/16 17:42:27 wiz Exp $
.\"
.\" Copyright (c)2002 Citrus Project,
.\" All rights reserved.
@@ -30,7 +30,7 @@
.\" ----------------------------------------------------------------------
.Sh NAME
.Nm wcstombs
-.Nd converts a wide character string to a multibyte character string
+.Nd converts a wide-character string to a multibyte character string
.\" ----------------------------------------------------------------------
.Sh LIBRARY
.Lb libc
@@ -42,7 +42,7 @@
.\" ----------------------------------------------------------------------
.Sh DESCRIPTION
.Fn wcstombs
-converts the nul-terminated wide character string pointed to by
+converts the nul-terminated wide-character string pointed to by
.Fa pwcs
to the corresponding multibyte character string,
and stores it in the array pointed to by
@@ -75,7 +75,7 @@
The
.Fn wcstombs
returns the number of bytes to store the whole multibyte character string
-corresponding to the wide character string pointed to by
+corresponding to the wide-character string pointed to by
.Fa pwcs .
In this case,
.Fa n
Index: src/lib/libc/locale/mbstowcs.3
diff -u src/lib/libc/locale/mbstowcs.3:1.10 src/lib/libc/locale/mbstowcs.3:1.11
--- src/lib/libc/locale/mbstowcs.3:1.10 Mon Oct 16 08:42:16 2006
+++ src/lib/libc/locale/mbstowcs.3 Thu Dec 16 17:42:27 2010
@@ -1,4 +1,4 @@
-.\" $NetBSD: mbstowcs.3,v 1.10 2006/10/16 08:42:16 wiz Exp $
+.\" $NetBSD: mbstowcs.3,v 1.11 2010/12/16 17:42:27 wiz Exp $
.\"
.\" Copyright (c)2002 Citrus Project,
.\" All rights reserved.
@@ -30,7 +30,7 @@
.\" ----------------------------------------------------------------------
.Sh NAME
.Nm mbstowcs
-.Nd converts a multibyte character string to a wide character string
+.Nd converts a multibyte character string to a wide-character string
.\" ----------------------------------------------------------------------
.Sh LIBRARY
.Lb libc
@@ -44,7 +44,7 @@
.Fn mbstowcs
converts a nul-terminated multibyte character string pointed to by
.Fa s
-to the corresponding wide character string and stores it in the array
+to the corresponding wide-character string and stores it in the array
pointed to by
.Fa pwcs .
This function may modify the first at most
@@ -67,7 +67,7 @@
.Bl -tag -width 012345678901
.It pwcs == NULL
.Fn mbstowcs
-returns the number of elements to store the whole wide character string
+returns the number of elements to store the whole wide-character string
corresponding to the multibyte character string pointed to by
.Fa s .
In this case,
Index: src/lib/libc/locale/wcscoll.3
diff -u src/lib/libc/locale/wcscoll.3:1.2 src/lib/libc/locale/wcscoll.3:1.3
--- src/lib/libc/locale/wcscoll.3:1.2 Sat Oct 14 07:44:58 2006
+++ src/lib/libc/locale/wcscoll.3 Thu Dec 16 17:42:27 2010
@@ -1,4 +1,4 @@
-.\" $NetBSD: wcscoll.3,v 1.2 2006/10/14 07:44:58 wiz Exp $
+.\" $NetBSD: wcscoll.3,v 1.3 2010/12/16 17:42:27 wiz Exp $
.\"
.\" Copyright (c) 1990, 1991, 1993
.\" The Regents of the University of California. All rights reserved.
@@ -88,7 +88,7 @@
function will fail if:
.Bl -tag -width Er
.It Bq Er EILSEQ
-An invalid wide character code was specified.
+An invalid wide-character code was specified.
.It Bq Er ENOMEM
Cannot allocate enough memory for temporary buffers.
.El
Index: src/lib/libc/locale/wcstol.3
diff -u src/lib/libc/locale/wcstol.3:1.2 src/lib/libc/locale/wcstol.3:1.3
--- src/lib/libc/locale/wcstol.3:1.2 Tue Aug 8 17:32:05 2006
+++ src/lib/libc/locale/wcstol.3 Thu Dec 16 17:42:27 2010
@@ -1,4 +1,4 @@
-.\" $NetBSD: wcstol.3,v 1.2 2006/08/08 17:32:05 wiz Exp $
+.\" $NetBSD: wcstol.3,v 1.3 2010/12/16 17:42:27 wiz Exp $
.\"
.\" Copyright (c) 2002 Tim J. Robbins
.\" All rights reserved.
@@ -33,7 +33,7 @@
.Nm wcstol , wcstoul ,
.Nm wcstoll , wcstoull ,
.Nm wcstoimax , wcstoumax
-.Nd "convert a wide character string value to a"
+.Nd "convert a wide-character string value to a"
.Vt long ,
.Vt "unsigned long" ,
.Vt "long long" ,
Index: src/lib/libc/locale/wcsrtombs.3
diff -u src/lib/libc/locale/wcsrtombs.3:1.12 src/lib/libc/locale/wcsrtombs.3:1.13
--- src/lib/libc/locale/wcsrtombs.3:1.12 Mon Oct 16 08:42:16 2006
+++ src/lib/libc/locale/wcsrtombs.3 Thu Dec 16 17:42:27 2010
@@ -1,4 +1,4 @@
-.\" $NetBSD: wcsrtombs.3,v 1.12 2006/10/16 08:42:16 wiz Exp $
+.\" $NetBSD: wcsrtombs.3,v 1.13 2010/12/16 17:42:27 wiz Exp $
.\"
.\" Copyright (c)2002 Citrus Project,
.\" All rights reserved.
@@ -30,7 +30,7 @@
.\" ----------------------------------------------------------------------
.Sh NAME
.Nm wcsrtombs
-.Nd converts a wide character string to a multibyte character string \
+.Nd converts a wide-character string to a multibyte character string \
(restartable)
.\" ----------------------------------------------------------------------
.Sh LIBRARY
@@ -45,7 +45,7 @@
.Sh DESCRIPTION
The
.Fn wcsrtombs
-converts the nul-terminated wide character string indirectly pointed
+converts the nul-terminated wide-character string indirectly pointed
to by
.Fa pwcs
to the corresponding multibyte character string,
@@ -102,7 +102,7 @@
.It "s == NULL"
.Fn wcsrtombs
returns the number of bytes to store the whole multibyte character string
-corresponding to the wide character string pointed to by
+corresponding to the wide-character string pointed to by
.Fa pwcs ,
not including the terminating nul byte.
In this case,
Index: src/lib/libc/locale/wcsxfrm.3
diff -u src/lib/libc/locale/wcsxfrm.3:1.3 src/lib/libc/locale/wcsxfrm.3:1.4
--- src/lib/libc/locale/wcsxfrm.3:1.3 Mon Oct 16 08:42:16 2006
+++ src/lib/libc/locale/wcsxfrm.3 Thu Dec 16 17:42:27 2010
@@ -1,4 +1,4 @@
-.\" $NetBSD: wcsxfrm.3,v 1.3 2006/10/16 08:42:16 wiz Exp $
+.\" $NetBSD: wcsxfrm.3,v 1.4 2010/12/16 17:42:27 wiz Exp $
.\"
.\" Copyright (c) 1990, 1991, 1993
.\" The Regents of the University of California. All rights reserved.
@@ -54,7 +54,7 @@
.Sh DESCRIPTION
The
.Fn wcsxfrm
-function transforms a nul-terminated wide character string pointed to by
+function transforms a nul-terminated wide-character string pointed to by
.Fa src
according to the current locale collation order then copies the
transformed string into
Index: src/lib/libc/stdio/fgetwln.3
diff -u src/lib/libc/stdio/fgetwln.3:1.1 src/lib/libc/stdio/fgetwln.3:1.2
--- src/lib/libc/stdio/fgetwln.3:1.1 Sat May 14 23:51:02 2005
+++ src/lib/libc/stdio/fgetwln.3 Thu Dec 16 17:42:27 2010
@@ -1,4 +1,4 @@
-.\" $NetBSD: fgetwln.3,v 1.1 2005/05/14 23:51:02 christos Exp $
+.\" $NetBSD: fgetwln.3,v 1.2 2010/12/16 17:42:27 wiz Exp $
.\" Copyright (c) 1990, 1991, 1993
.\" The Regents of the University of California. All rights reserved.
.\"
@@ -54,7 +54,7 @@
.Fa stream .
This line is
.Em not
-a standard wide character string as it does not end with a terminating
+a standard wide-character string as it does not end with a terminating
null wide character.
The length of the line, including the final newline,
is stored in the memory location to which
Index: src/lib/libc/stdio/fgetws.3
diff -u src/lib/libc/stdio/fgetws.3:1.2 src/lib/libc/stdio/fgetws.3:1.3
--- src/lib/libc/stdio/fgetws.3:1.2 Thu Aug 7 16:43:23 2003
+++ src/lib/libc/stdio/fgetws.3 Thu Dec 16 17:42:27 2010
@@ -1,4 +1,4 @@
-.\" $NetBSD: fgetws.3,v 1.2 2003/08/07 16:43:23 agc Exp $
+.\" $NetBSD: fgetws.3,v 1.3 2010/12/16 17:42:27 wiz Exp $
.\"
.\" Copyright (c) 1990, 1991, 1993
.\" The Regents of the University of California. All rights reserved.
@@ -58,7 +58,7 @@
.Fa n
from the given
.Fa fp
-and stores them in the wide character string
+and stores them in the wide-character string
.Fa ws .
Reading stops when a newline character is found,
at end-of-file or error.
Index: src/lib/libc/stdio/fputws.3
diff -u src/lib/libc/stdio/fputws.3:1.2 src/lib/libc/stdio/fputws.3:1.3
--- src/lib/libc/stdio/fputws.3:1.2 Thu Aug 7 16:43:24 2003
+++ src/lib/libc/stdio/fputws.3 Thu Dec 16 17:42:27 2010
@@ -1,4 +1,4 @@
-.\" $NetBSD: fputws.3,v 1.2 2003/08/07 16:43:24 agc Exp $
+.\" $NetBSD: fputws.3,v 1.3 2010/12/16 17:42:27 wiz Exp $
.\"
.\" Copyright (c) 1990, 1991, 1993
.\" The Regents of the University of California. All rights reserved.
@@ -53,7 +53,7 @@
.Sh DESCRIPTION
The
.Fn fputws
-function writes the wide character string pointed to by
+function writes the wide-character string pointed to by
.Fa ws
to the stream pointed to by
.Fa fp .
Index: src/lib/libc/stdio/wscanf.3
diff -u src/lib/libc/stdio/wscanf.3:1.2 src/lib/libc/stdio/wscanf.3:1.3
--- src/lib/libc/stdio/wscanf.3:1.2 Fri May 14 03:05:28 2010
+++ src/lib/libc/stdio/wscanf.3 Thu Dec 16 17:42:27 2010
@@ -1,4 +1,4 @@
-.\" $NetBSD: wscanf.3,v 1.2 2010/05/14 03:05:28 joerg Exp $
+.\" $NetBSD: wscanf.3,v 1.3 2010/12/16 17:42:27 wiz Exp $
.\" Copyright (c) 1990, 1991, 1993
.\" The Regents of the University of California. All rights reserved.
.\"
@@ -89,7 +89,7 @@
.Fa stream ,
and
.Fn swscanf
-reads its input from the wide character string pointed to by
+reads its input from the wide-character string pointed to by
.Fa str .
The
.Fn vfwscanf
@@ -105,7 +105,7 @@
function scans a variable argument list from the standard input and
the
.Fn vswscanf
-function scans it from a wide character string;
+function scans it from a wide-character string;
these are analogous to
the
.Fn vwprintf
Index: src/lib/libc/stdio/getwc.3
diff -u src/lib/libc/stdio/getwc.3:1.8 src/lib/libc/stdio/getwc.3:1.9
--- src/lib/libc/stdio/getwc.3:1.8 Thu May 6 08:58:57 2010
+++ src/lib/libc/stdio/getwc.3 Thu Dec 16 17:42:27 2010
@@ -1,4 +1,4 @@
-.\" $NetBSD: getwc.3,v 1.8 2010/05/06 08:58:57 jruoho Exp $
+.\" $NetBSD: getwc.3,v 1.9 2010/12/16 17:42:27 wiz Exp $
.\"
.\" Copyright (c) 1990, 1991, 1993
.\" The Regents of the University of California. All rights reserved.
@@ -40,7 +40,7 @@
.Nm fgetwc ,
.Nm getwc ,
.Nm getwchar ,
-.Nd get next wide-character from input stream
+.Nd get next wide character from input stream
.Sh LIBRARY
.Lb libc
.Sh SYNOPSIS
@@ -56,7 +56,7 @@
The
.Fn fgetwc
function
-obtains the next input wide-character (if present) from the stream pointed at by
+obtains the next input wide character (if present) from the stream pointed at by
.Fa stream ,
or the next character pushed back on the stream via
.Xr ungetwc 3 .
@@ -75,7 +75,7 @@
.Fn getwc
with the argument stdin.
.Sh RETURN VALUES
-If successful, these routines return the next wide-character
+If successful, these routines return the next wide character
from the
.Fa stream .
If the stream is at end-of-file or a read error occurs,
Index: src/lib/libc/stdio/putwc.3
diff -u src/lib/libc/stdio/putwc.3:1.8 src/lib/libc/stdio/putwc.3:1.9
--- src/lib/libc/stdio/putwc.3:1.8 Sat Jan 24 16:59:30 2004
+++ src/lib/libc/stdio/putwc.3 Thu Dec 16 17:42:27 2010
@@ -1,4 +1,4 @@
-.\" $NetBSD: putwc.3,v 1.8 2004/01/24 16:59:30 wiz Exp $
+.\" $NetBSD: putwc.3,v 1.9 2010/12/16 17:42:27 wiz Exp $
.\"
.\" Copyright (c) 1990, 1991, 1993
.\" The Regents of the University of California. All rights reserved.
@@ -40,7 +40,7 @@
.Nm fputwc ,
.Nm putwc ,
.Nm putwchar ,
-.Nd output a wide-character to a stream
+.Nd output a wide character to a stream
.Sh LIBRARY
.Lb libc
.Sh SYNOPSIS
@@ -56,7 +56,7 @@
The
.Fn fputwc
function
-writes the wide-character
+writes the wide character
.Fa wc
to the output stream pointed to by
.Fa stream .
@@ -82,7 +82,7 @@
.Fn putwc ,
and
.Fn putwchar
-return the wide-character written.
+return the wide character written.
If an error occurs, the value
.Dv WEOF
is returned.
Index: src/lib/libc/stdio/printf.3
diff -u src/lib/libc/stdio/printf.3:1.54 src/lib/libc/stdio/printf.3:1.55
--- src/lib/libc/stdio/printf.3:1.54 Mon Sep 6 19:47:37 2010
+++ src/lib/libc/stdio/printf.3 Thu Dec 16 17:42:27 2010
@@ -1,4 +1,4 @@
-.\" $NetBSD: printf.3,v 1.54 2010/09/06 19:47:37 wiz Exp $
+.\" $NetBSD: printf.3,v 1.55 2010/12/16 17:42:27 wiz Exp $
.\"
.\" Copyright (c) 1990, 1991, 1993
.\" The Regents of the University of California. All rights reserved.
@@ -780,7 +780,7 @@
family of functions may fail if:
.Bl -tag -width Er
.It Bq Er EILSEQ
-An invalid wide character code was encountered.
+An invalid wide-character code was encountered.
.It Bq Er ENOMEM
Insufficient storage space is available.
.El
Index: src/lib/libc/stdio/ungetwc.3
diff -u src/lib/libc/stdio/ungetwc.3:1.7 src/lib/libc/stdio/ungetwc.3:1.8
--- src/lib/libc/stdio/ungetwc.3:1.7 Mon Sep 8 17:54:32 2003
+++ src/lib/libc/stdio/ungetwc.3 Thu Dec 16 17:42:27 2010
@@ -1,4 +1,4 @@
-.\" $NetBSD: ungetwc.3,v 1.7 2003/09/08 17:54:32 wiz Exp $
+.\" $NetBSD: ungetwc.3,v 1.8 2010/12/16 17:42:27 wiz Exp $
.\"
.\" Copyright (c) 1990, 1991, 1993
.\" The Regents of the University of California. All rights reserved.
@@ -38,7 +38,7 @@
.Os
.Sh NAME
.Nm ungetwc
-.Nd un-get wide-character from input stream
+.Nd un-get wide character from input stream
.Sh LIBRARY
.Lb libc
.Sh SYNOPSIS
@@ -49,12 +49,12 @@
.Sh DESCRIPTION
The
.Fn ungetwc
-function pushes the wide-character
+function pushes the wide character
.Fa wc
(converted to an wchar_t)
back onto the input stream pointed to by
.Fa stream .
-The pushed-backed wide-characters will be returned by subsequent reads on the
+The pushed-backed wide characters will be returned by subsequent reads on the
stream (in reverse order).
A successful intervening call, using the same stream, to one of the file
positioning functions
@@ -62,9 +62,9 @@
.Xr fsetpos 3 ,
or
.Xr rewind 3
-will discard the pushed back wide-characters.
+will discard the pushed back wide characters.
.Pp
-One wide-character of push-back is guaranteed,
+One wide character of push-back is guaranteed,
but as long as there is
sufficient memory, an effectively infinite amount of pushback is allowed.
.Pp
@@ -75,7 +75,7 @@
.Fn ungetwc
function
returns
-the wide-character pushed-back after the conversion, or
+the wide character pushed-back after the conversion, or
.Dv WEOF
if the operation fails.
If the value of the argument
Index: src/lib/libc/stdio/wprintf.3
diff -u src/lib/libc/stdio/wprintf.3:1.7 src/lib/libc/stdio/wprintf.3:1.8
--- src/lib/libc/stdio/wprintf.3:1.7 Fri Apr 30 06:23:56 2010
+++ src/lib/libc/stdio/wprintf.3 Thu Dec 16 17:42:27 2010
@@ -1,4 +1,4 @@
-.\" $NetBSD: wprintf.3,v 1.7 2010/04/30 06:23:56 jruoho Exp $
+.\" $NetBSD: wprintf.3,v 1.8 2010/12/16 17:42:27 wiz Exp $
.\" Copyright (c) 1990, 1991, 1993
.\" The Regents of the University of California. All rights reserved.
.\"
@@ -85,7 +85,7 @@
.Fn swprintf
and
.Fn vswprintf
-write to the wide character string
+write to the wide-character string
.Fa ws .
.Pp
These functions write the output under the control of a
Index: src/lib/libc/stdio/vfscanf.c
diff -u src/lib/libc/stdio/vfscanf.c:1.40 src/lib/libc/stdio/vfscanf.c:1.41
--- src/lib/libc/stdio/vfscanf.c:1.40 Fri Jan 30 23:48:36 2009
+++ src/lib/libc/stdio/vfscanf.c Thu Dec 16 17:42:27 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: vfscanf.c,v 1.40 2009/01/30 23:48:36 lukem Exp $ */
+/* $NetBSD: vfscanf.c,v 1.41 2010/12/16 17:42:27 wiz Exp $ */
/*-
* Copyright (c) 1990, 1993
@@ -38,7 +38,7 @@
static char sccsid[] = "@(#)vfscanf.c 8.1 (Berkeley) 6/4/93";
__FBSDID("$FreeBSD: src/lib/libc/stdio/vfscanf.c,v 1.41 2007/01/09 00:28:07 imp Exp $");
#else
-__RCSID("$NetBSD: vfscanf.c,v 1.40 2009/01/30 23:48:36 lukem Exp $");
+__RCSID("$NetBSD: vfscanf.c,v 1.41 2010/12/16 17:42:27 wiz Exp $");
#endif
#endif /* LIBC_SCCS and not lint */
@@ -165,7 +165,7 @@
int base; /* base argument to conversion function */
char ccltab[256]; /* character class table for %[...] */
char buf[BUF]; /* buffer for numeric and mb conversions */
- wchar_t *wcp; /* handy wide character pointer */
+ wchar_t *wcp; /* handy wide-character pointer */
size_t nconv; /* length of multibyte sequence converted */
static const mbstate_t initial;
mbstate_t mbs;
Index: src/lib/libc/stdio/vfwprintf.c
diff -u src/lib/libc/stdio/vfwprintf.c:1.22 src/lib/libc/stdio/vfwprintf.c:1.23
--- src/lib/libc/stdio/vfwprintf.c:1.22 Fri Nov 19 00:44:18 2010
+++ src/lib/libc/stdio/vfwprintf.c Thu Dec 16 17:42:27 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: vfwprintf.c,v 1.22 2010/11/19 00:44:18 christos Exp $ */
+/* $NetBSD: vfwprintf.c,v 1.23 2010/12/16 17:42:27 wiz Exp $ */
/*-
* Copyright (c) 1990, 1993
@@ -38,7 +38,7 @@
static char sccsid[] = "@(#)vfprintf.c 8.1 (Berkeley) 6/4/93";
__FBSDID("$FreeBSD: src/lib/libc/stdio/vfwprintf.c,v 1.27 2007/01/09 00:28:08 imp Exp $");
#else
-__RCSID("$NetBSD: vfwprintf.c,v 1.22 2010/11/19 00:44:18 christos Exp $");
+__RCSID("$NetBSD: vfwprintf.c,v 1.23 2010/12/16 17:42:27 wiz Exp $");
#endif
#endif /* LIBC_SCCS and not lint */
@@ -475,9 +475,9 @@
}
#else
/*
- * Convert a wide character string argument for the %ls format to a multibyte
+ * Convert a wide-character string argument for the %ls format to a multibyte
* string representation. If not -1, prec specifies the maximum number of
- * bytes to output, and also means that we can't assume that the wide char.
+ * bytes to output, and also means that we can't assume that the wide-char.
* string ends is null-terminated.
*/
static char *
Index: src/lib/libc/string/wcscasecmp.3
diff -u src/lib/libc/string/wcscasecmp.3:1.2 src/lib/libc/string/wcscasecmp.3:1.3
--- src/lib/libc/string/wcscasecmp.3:1.2 Sat Sep 2 23:49:02 2006
+++ src/lib/libc/string/wcscasecmp.3 Thu Dec 16 17:42:28 2010
@@ -1,4 +1,4 @@
-.\" $NetBSD: wcscasecmp.3,v 1.2 2006/09/02 23:49:02 wiz Exp $
+.\" $NetBSD: wcscasecmp.3,v 1.3 2010/12/16 17:42:28 wiz Exp $
.\"
.\" Copyright (c) 1990, 1991, 1993
.\" The Regents of the University of California. All rights reserved.
@@ -37,7 +37,7 @@
.Sh NAME
.Nm wcscasecmp ,
.Nm wcsncasecmp
-.Nd compare wide character strings, ignoring case
+.Nd compare wide-character strings, ignoring case
.Sh LIBRARY
.Lb libc
.Sh SYNOPSIS
Index: src/lib/libc/string/wcsdup.3
diff -u src/lib/libc/string/wcsdup.3:1.2 src/lib/libc/string/wcsdup.3:1.3
--- src/lib/libc/string/wcsdup.3:1.2 Sat Sep 2 23:49:36 2006
+++ src/lib/libc/string/wcsdup.3 Thu Dec 16 17:42:28 2010
@@ -1,4 +1,4 @@
-.\" $NetBSD: wcsdup.3,v 1.2 2006/09/02 23:49:36 wiz Exp $
+.\" $NetBSD: wcsdup.3,v 1.3 2010/12/16 17:42:28 wiz Exp $
.\"
.\" Copyright (c) 1990, 1991, 1993
.\" The Regents of the University of California. All rights reserved.
@@ -46,7 +46,7 @@
.Fn wcsdup
function
allocates sufficient memory for a copy
-of the wide character string
+of the wide-character string
.Fa str ,
does the copy, and returns a pointer to it.
The pointer may subsequently be used as an
Index: src/lib/libc/string/wcstok.3
diff -u src/lib/libc/string/wcstok.3:1.5 src/lib/libc/string/wcstok.3:1.6
--- src/lib/libc/string/wcstok.3:1.5 Mon Oct 16 08:48:45 2006
+++ src/lib/libc/string/wcstok.3 Thu Dec 16 17:42:28 2010
@@ -1,4 +1,4 @@
-.\" $NetBSD: wcstok.3,v 1.5 2006/10/16 08:48:45 wiz Exp $
+.\" $NetBSD: wcstok.3,v 1.6 2010/12/16 17:42:28 wiz Exp $
.\"
.\" Copyright (c) 1998 Softweyr LLC. All rights reserved.
.\"
@@ -68,7 +68,7 @@
The
.Fn wcstok
function
-is used to isolate sequential tokens in a nul-terminated wide character
+is used to isolate sequential tokens in a nul-terminated wide-character
string,
.Fa str .
These tokens are separated in the string by at least one of the
@@ -89,7 +89,7 @@
.Pp
The
.Fn wcstok
-function is the wide character counterpart of the
+function is the wide-character counterpart of the
.Fn strtok_r
function.
.Sh RETURN VALUES
@@ -100,7 +100,7 @@
after replacing the token itself with a nul wide character (L'\e0').
When no more tokens remain, a null pointer is returned.
.Sh EXAMPLES
-The following code fragment splits a wide character string on
+The following code fragment splits a wide-character string on
.Tn ASCII
space, tab and newline characters and writes the tokens to
standard output:
Index: src/lib/libc/string/wmemchr.3
diff -u src/lib/libc/string/wmemchr.3:1.14 src/lib/libc/string/wmemchr.3:1.15
--- src/lib/libc/string/wmemchr.3:1.14 Sat May 2 09:31:01 2009
+++ src/lib/libc/string/wmemchr.3 Thu Dec 16 17:42:28 2010
@@ -1,4 +1,4 @@
-.\" $NetBSD: wmemchr.3,v 1.14 2009/05/02 09:31:01 wiz Exp $
+.\" $NetBSD: wmemchr.3,v 1.15 2010/12/16 17:42:28 wiz Exp $
.\"
.\" Copyright (c) 1990, 1991, 1993
.\" The Regents of the University of California. All rights reserved.
@@ -58,7 +58,7 @@
.Nm wcsspn ,
.Nm wcsstr
.Nm wcswcs
-.Nd wide character string manipulation operations
+.Nd wide-character string manipulation operations
.Sh LIBRARY
.Lb libc
.Sh SYNOPSIS
@@ -106,7 +106,7 @@
.Ft wchar_t *
.Fn wcswcs "const wchar_t *s1" "const wchar_t *s2"
.Sh DESCRIPTION
-These functions implement string manipulation operations over wide character
+These functions implement string manipulation operations over wide-character
strings.
For a detailed description, refer to the documents for the respective
single-byte counterpart, such as
Index: src/lib/libcurses/addbytes.c
diff -u src/lib/libcurses/addbytes.c:1.37 src/lib/libcurses/addbytes.c:1.38
--- src/lib/libcurses/addbytes.c:1.37 Tue Nov 23 05:38:35 2010
+++ src/lib/libcurses/addbytes.c Thu Dec 16 17:42:28 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: addbytes.c,v 1.37 2010/11/23 05:38:35 tnozaki Exp $ */
+/* $NetBSD: addbytes.c,v 1.38 2010/12/16 17:42:28 wiz Exp $ */
/*
* Copyright (c) 1987, 1993, 1994
@@ -34,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)addbytes.c 8.4 (Berkeley) 5/4/94";
#else
-__RCSID("$NetBSD: addbytes.c,v 1.37 2010/11/23 05:38:35 tnozaki Exp $");
+__RCSID("$NetBSD: addbytes.c,v 1.38 2010/12/16 17:42:28 wiz Exp $");
#endif
#endif /* not lint */
@@ -143,7 +143,7 @@
count--;
#else
/*
- * For wide character support only, try and convert the
+ * For wide-character support only, try and convert the
* given string into a wide character - we do this because
* this is how ncurses behaves (not that I think this is
* actually the correct thing to do but if we don't do it
Index: src/lib/libcurses/cchar.c
diff -u src/lib/libcurses/cchar.c:1.4 src/lib/libcurses/cchar.c:1.5
--- src/lib/libcurses/cchar.c:1.4 Tue Feb 23 19:48:26 2010
+++ src/lib/libcurses/cchar.c Thu Dec 16 17:42:28 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: cchar.c,v 1.4 2010/02/23 19:48:26 drochner Exp $ */
+/* $NetBSD: cchar.c,v 1.5 2010/12/16 17:42:28 wiz Exp $ */
/*
* Copyright (c) 2005 The NetBSD Foundation Inc.
@@ -36,7 +36,7 @@
#include <sys/cdefs.h>
#ifndef lint
-__RCSID("$NetBSD: cchar.c,v 1.4 2010/02/23 19:48:26 drochner Exp $");
+__RCSID("$NetBSD: cchar.c,v 1.5 2010/12/16 17:42:28 wiz Exp $");
#endif /* not lint */
#include <string.h>
@@ -46,7 +46,7 @@
/*
* getcchar --
- * get a wide character string and rendition from a cchar_t
+ * get a wide-character string and rendition from a cchar_t
*/
int
getcchar(const cchar_t *wcval, wchar_t *wch, attr_t *attrs,
@@ -80,7 +80,7 @@
/*
* setcchar --
- * set cchar_t from a wide character string and rendition
+ * set cchar_t from a wide-character string and rendition
*/
int
setcchar(cchar_t *wcval, const wchar_t *wch, const attr_t attrs,
Index: src/lib/libcurses/curses.h
diff -u src/lib/libcurses/curses.h:1.100 src/lib/libcurses/curses.h:1.101
--- src/lib/libcurses/curses.h:1.100 Tue Feb 23 19:48:26 2010
+++ src/lib/libcurses/curses.h Thu Dec 16 17:42:28 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: curses.h,v 1.100 2010/02/23 19:48:26 drochner Exp $ */
+/* $NetBSD: curses.h,v 1.101 2010/12/16 17:42:28 wiz Exp $ */
/*
* Copyright (c) 1981, 1993, 1994
@@ -31,9 +31,9 @@
* @(#)curses.h 8.5 (Berkeley) 4/29/95
*
* Modified by Ruibiao Qiu <[email protected],[email protected]> 2005
- * to add wide character support
+ * to add wide-character support
* - Add complex character structure (cchar_t)
- * - Add definitions of wide character routines
+ * - Add definitions of wide-character routines
* - Add KEY_CODE_YES
*/
@@ -808,7 +808,7 @@
int mvchgat(int, int, int, attr_t, short, const void *);
int mvwchgat(WINDOW *, int, int, int, attr_t, short, const void *);
-/* wide character support routines */
+/* wide-character support routines */
/* return ERR when HAVE_WCHAR is not defined */
/* add */
int add_wch(const cchar_t *);
Index: src/lib/libcurses/curses_private.h
diff -u src/lib/libcurses/curses_private.h:1.45 src/lib/libcurses/curses_private.h:1.46
--- src/lib/libcurses/curses_private.h:1.45 Tue Feb 23 19:48:26 2010
+++ src/lib/libcurses/curses_private.h Thu Dec 16 17:42:28 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: curses_private.h,v 1.45 2010/02/23 19:48:26 drochner Exp $ */
+/* $NetBSD: curses_private.h,v 1.46 2010/12/16 17:42:28 wiz Exp $ */
/*-
* Copyright (c) 1998-2000 Brett Lymn
@@ -35,8 +35,8 @@
* - Add a compiler variable HAVE_WCHAR for wide character only code
* - Add a pointer to liked list of non-spacing characters in __ldata
* and the macro to access the width field in the attribute field
- * - Add a circular input character buffer in __screen to handle wide
- * character input (used in get_wch())
+ * - Add a circular input character buffer in __screen to handle
+ * wide-character input (used in get_wch())
*/
#include <term.h>
Index: src/lib/libcurses/get_wch.c
diff -u src/lib/libcurses/get_wch.c:1.8 src/lib/libcurses/get_wch.c:1.9
--- src/lib/libcurses/get_wch.c:1.8 Wed Nov 4 21:51:11 2009
+++ src/lib/libcurses/get_wch.c Thu Dec 16 17:42:28 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: get_wch.c,v 1.8 2009/11/04 21:51:11 dsl Exp $ */
+/* $NetBSD: get_wch.c,v 1.9 2010/12/16 17:42:28 wiz Exp $ */
/*
* Copyright (c) 2005 The NetBSD Foundation Inc.
@@ -36,7 +36,7 @@
#include <sys/cdefs.h>
#ifndef lint
-__RCSID("$NetBSD: get_wch.c,v 1.8 2009/11/04 21:51:11 dsl Exp $");
+__RCSID("$NetBSD: get_wch.c,v 1.9 2010/12/16 17:42:28 wiz Exp $");
#endif /* not lint */
#include <string.h>
@@ -187,7 +187,7 @@
#endif /* DEBUG */
}
} else if (wstate == INKEY_WCASSEMBLING) {
- /* assembling a wide char sequence */
+ /* assembling a wide-char sequence */
if (delay) {
if (__timeout(to ? (ESCDELAY / 100) : delay)
== ERR)
@@ -322,7 +322,7 @@
|| ((current->key[mapping]->type
== KEYMAP_LEAF)
&& (current->key[mapping]->enable == FALSE))) {
- /* wide character specific code */
+ /* wide-character specific code */
#ifdef DEBUG
__CTRACE(__CTRACE_INPUT,
"inkey: Checking for wide char\n");
Index: src/lib/libcurses/ins_wstr.c
diff -u src/lib/libcurses/ins_wstr.c:1.5 src/lib/libcurses/ins_wstr.c:1.6
--- src/lib/libcurses/ins_wstr.c:1.5 Tue Feb 23 19:48:26 2010
+++ src/lib/libcurses/ins_wstr.c Thu Dec 16 17:42:28 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: ins_wstr.c,v 1.5 2010/02/23 19:48:26 drochner Exp $ */
+/* $NetBSD: ins_wstr.c,v 1.6 2010/12/16 17:42:28 wiz Exp $ */
/*
* Copyright (c) 2005 The NetBSD Foundation Inc.
@@ -36,7 +36,7 @@
#include <sys/cdefs.h>
#ifndef lint
-__RCSID("$NetBSD: ins_wstr.c,v 1.5 2010/02/23 19:48:26 drochner Exp $");
+__RCSID("$NetBSD: ins_wstr.c,v 1.6 2010/12/16 17:42:28 wiz Exp $");
#endif /* not lint */
#include <string.h>
@@ -47,7 +47,7 @@
/*
* ins_wstr --
- * insert a multi-character wide character string into the current window
+ * insert a multi-character wide-character string into the current window
*/
int
ins_wstr(const wchar_t *wstr)
@@ -57,7 +57,7 @@
/*
* ins_nwstr --
- * insert a multi-character wide character string into the current window
+ * insert a multi-character wide-character string into the current window
* with at most n characters
*/
int
Index: src/lib/libedit/chartype.h
diff -u src/lib/libedit/chartype.h:1.6 src/lib/libedit/chartype.h:1.7
--- src/lib/libedit/chartype.h:1.6 Tue Apr 20 02:01:13 2010
+++ src/lib/libedit/chartype.h Thu Dec 16 17:42:28 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: chartype.h,v 1.6 2010/04/20 02:01:13 christos Exp $ */
+/* $NetBSD: chartype.h,v 1.7 2010/12/16 17:42:28 wiz Exp $ */
/*-
* Copyright (c) 2009 The NetBSD Foundation, Inc.
@@ -172,11 +172,11 @@
} ct_buffer_t;
#define ct_encode_string __ct_encode_string
-/* Encode a wide character string and return the UTF-8 encoded result. */
+/* Encode a wide-character string and return the UTF-8 encoded result. */
public char *ct_encode_string(const Char *, ct_buffer_t *);
#define ct_decode_string __ct_decode_string
-/* Decode a (multi)?byte string and return the wide character string result. */
+/* Decode a (multi)?byte string and return the wide-character string result. */
public Char *ct_decode_string(const char *, ct_buffer_t *);
/* Decode a (multi)?byte argv string array.
Index: src/lib/libedit/editline.3
diff -u src/lib/libedit/editline.3:1.73 src/lib/libedit/editline.3:1.74
--- src/lib/libedit/editline.3:1.73 Sun Jan 3 19:05:26 2010
+++ src/lib/libedit/editline.3 Thu Dec 16 17:42:28 2010
@@ -1,4 +1,4 @@
-.\" $NetBSD: editline.3,v 1.73 2010/01/03 19:05:26 wiz Exp $
+.\" $NetBSD: editline.3,v 1.74 2010/12/16 17:42:28 wiz Exp $
.\"
.\" Copyright (c) 1997-2003 The NetBSD Foundation, Inc.
.\" All rights reserved.
@@ -173,7 +173,7 @@
and freed by
.Fn el_end .
.Pp
-The wide character functions behave the same way as their narrow
+The wide-character functions behave the same way as their narrow
counterparts.
.Pp
The following functions are available:
@@ -861,7 +861,7 @@
and
.Dv EL_RPROMPT .
Jaromir Dolecek implemented the readline emulation.
-Johny Mattsson implemented wide character support.
+Johny Mattsson implemented wide-character support.
.Sh BUGS
At this time, it is the responsibility of the caller to
check the result of the
Index: src/share/doc/smm/01.setup/3.t
diff -u src/share/doc/smm/01.setup/3.t:1.4 src/share/doc/smm/01.setup/3.t:1.5
--- src/share/doc/smm/01.setup/3.t:1.4 Thu Aug 7 10:30:52 2003
+++ src/share/doc/smm/01.setup/3.t Thu Dec 16 17:42:28 2010
@@ -1,4 +1,4 @@
-.\" $NetBSD: 3.t,v 1.4 2003/08/07 10:30:52 agc Exp $
+.\" $NetBSD: 3.t,v 1.5 2010/12/16 17:42:28 wiz Exp $
.\"
.\" Copyright (c) 1980, 1986, 1988, 1993
.\" The Regents of the University of California. All rights reserved.
@@ -1759,7 +1759,7 @@
This includes support for file name matching, shell globbing
and both basic and extended regular expressions.
.IP \(bu
-ANSI C multibyte and wide character support has been integrated.
+ANSI C multibyte and wide-character support has been integrated.
The rune functionality from the Bell Labs' Plan 9 system is provided
as well.
.IP \(bu
Index: src/share/man/man0/title.cdrom
diff -u src/share/man/man0/title.cdrom:1.6 src/share/man/man0/title.cdrom:1.7
--- src/share/man/man0/title.cdrom:1.6 Mon Oct 13 14:34:25 2003
+++ src/share/man/man0/title.cdrom Thu Dec 16 17:42:28 2010
@@ -1,4 +1,4 @@
-.\" $NetBSD: title.cdrom,v 1.6 2003/10/13 14:34:25 agc Exp $
+.\" $NetBSD: title.cdrom,v 1.7 2010/12/16 17:42:28 wiz Exp $
.\"
.\" Copyright (c) 1994 Regents of the University of California.
.\" All rights reserved.
@@ -908,7 +908,7 @@
This includes support for file name matching, shell globbing
and both basic and extended regular expressions.
.IP \(bu
-ANSI C multibyte and wide character support has been integrated.
+ANSI C multibyte and wide-character support has been integrated.
The rune functionality from the Bell Labs' Plan 9 system is provided
as well.
.IP \(bu
Index: src/share/man/man0/title.urm
diff -u src/share/man/man0/title.urm:1.8 src/share/man/man0/title.urm:1.9
--- src/share/man/man0/title.urm:1.8 Tue Dec 8 09:23:06 2009
+++ src/share/man/man0/title.urm Thu Dec 16 17:42:28 2010
@@ -1,4 +1,4 @@
-.\" $NetBSD: title.urm,v 1.8 2009/12/08 09:23:06 mbalmer Exp $
+.\" $NetBSD: title.urm,v 1.9 2010/12/16 17:42:28 wiz Exp $
.\"
.\" Copyright (c) 1980, 1993, 1994 Regents of the University of California.
.\" All rights reserved.
@@ -887,7 +887,7 @@
This includes support for file name matching, shell globbing
and both basic and extended regular expressions.
.IP \(bu
-ANSI C multibyte and wide character support has been integrated.
+ANSI C multibyte and wide-character support has been integrated.
The rune functionality from the Bell Labs' Plan 9 system is provided
as well.
.IP \(bu
Index: src/usr.bin/xlint/lint1/scan.l
diff -u src/usr.bin/xlint/lint1/scan.l:1.47 src/usr.bin/xlint/lint1/scan.l:1.48
--- src/usr.bin/xlint/lint1/scan.l:1.47 Mon Jan 11 16:28:06 2010
+++ src/usr.bin/xlint/lint1/scan.l Thu Dec 16 17:42:29 2010
@@ -1,5 +1,5 @@
%{
-/* $NetBSD: scan.l,v 1.47 2010/01/11 16:28:06 christos Exp $ */
+/* $NetBSD: scan.l,v 1.48 2010/12/16 17:42:29 wiz Exp $ */
/*
* Copyright (c) 1996 Christopher G. Demetriou. All Rights Reserved.
@@ -35,7 +35,7 @@
#include <sys/cdefs.h>
#if defined(__RCSID) && !defined(lint)
-__RCSID("$NetBSD: scan.l,v 1.47 2010/01/11 16:28:06 christos Exp $");
+__RCSID("$NetBSD: scan.l,v 1.48 2010/12/16 17:42:29 wiz Exp $");
#endif
#include <stdlib.h>
@@ -1284,7 +1284,7 @@
/* unterminated string constant */
error(258);
- /* get length of wide character string */
+ /* get length of wide-character string */
(void)mblen(NULL, 0);
for (i = 0, wlen = 0; i < len; i += n, wlen++) {
if ((n = mblen(&s[i], MB_CUR_MAX)) == -1) {
Index: src/usr.sbin/chrtbl/chrtbl.8
diff -u src/usr.sbin/chrtbl/chrtbl.8:1.8 src/usr.sbin/chrtbl/chrtbl.8:1.9
--- src/usr.sbin/chrtbl/chrtbl.8:1.8 Wed Oct 21 01:07:47 2009
+++ src/usr.sbin/chrtbl/chrtbl.8 Thu Dec 16 17:42:29 2010
@@ -1,4 +1,4 @@
-.\" $NetBSD: chrtbl.8,v 1.8 2009/10/21 01:07:47 snj Exp $
+.\" $NetBSD: chrtbl.8,v 1.9 2010/12/16 17:42:29 wiz Exp $
.\"
.\" Copyright (c) 1997 Christos Zoulas
.\" All rights reserved.
@@ -81,5 +81,7 @@
.Xr setlocale 3
.Sh BUGS
Preliminary support of LC_NUMERIC is present, but not currently fully
-implemented. No support for wide character locales. Support for alternate
+implemented.
+No support for wide-character locales.
+Support for alternate
localized character sets and numeric formatting is currently not implemented.
