From 4b97577172adf196656c5d76ced169bbe94af331 Mon Sep 17 00:00:00 2001 From: ru Date: Thu, 5 Dec 2002 08:50:00 +0000 Subject: [PATCH] Capitalize ASCII code names. Approved by: re --- bin/sh/bltin/echo.1 | 4 +++- lib/libc/gen/uname.3 | 4 +++- lib/libc/locale/iscntrl.3 | 14 +++++++------- lib/libstand/libstand.3 | 7 +++++-- share/man/man7/ascii.7 | 36 ++++++++++++++++++------------------ usr.bin/hexdump/hexdump.1 | 12 ++++++------ usr.bin/hexdump/od.1 | 14 +++++++------- 7 files changed, 49 insertions(+), 42 deletions(-) diff --git a/bin/sh/bltin/echo.1 b/bin/sh/bltin/echo.1 index 742eaca28a7e..15393b1f1c4c 100644 --- a/bin/sh/bltin/echo.1 +++ b/bin/sh/bltin/echo.1 @@ -92,7 +92,9 @@ Output a (horizontal) tab character. Output a vertical tab. .It Li \e0 Ns Ar digits Output the character whose value is given by zero to three digits. -If there are zero digits, a nul character is output. +If there are zero digits, a +.Dv NUL +character is output. .It Li \e\e Output a backslash. .El diff --git a/lib/libc/gen/uname.3 b/lib/libc/gen/uname.3 index 946f1e0df8a7..330347deea28 100644 --- a/lib/libc/gen/uname.3 +++ b/lib/libc/gen/uname.3 @@ -47,7 +47,9 @@ .Sh DESCRIPTION The .Fn uname -function stores nul-terminated strings of information identifying +function stores +.Dv NUL Ns -terminated +strings of information identifying the current system into the structure referenced by .Fa name . .Pp diff --git a/lib/libc/locale/iscntrl.3 b/lib/libc/locale/iscntrl.3 index 194b95592dd6..417820b56e61 100644 --- a/lib/libc/locale/iscntrl.3 +++ b/lib/libc/locale/iscntrl.3 @@ -65,13 +65,13 @@ In the ASCII character set, this includes the following characters (with their numeric values shown in octal): .Pp .Bl -column \&000_``0''__ \&000_``0''__ \&000_``0''__ \&000_``0''__ \&000_``0''__ -.It "\&000\ nul \t001\ soh \t002\ stx \t003\ etx \t004\ eot" -.It "\&005\ enq \t006\ ack \t007\ bel \t010\ bs \t011\ ht" -.It "\&012\ nl \t013\ vt \t014\ np \t015\ cr \t016\ so" -.It "\&017\ si \t020\ dle \t021\ dc1 \t022\ dc2 \t023\ dc3" -.It "\&024\ dc4 \t025\ nak \t026\ syn \t027\ etb \t030\ can" -.It "\&031\ em \t032\ sub \t033\ esc \t034\ fs \t035\ gs" -.It "\&036\ rs \t037\ us \t177\ del" +.It "\&000\ NUL \t001\ SOH \t002\ STX \t003\ ETX \t004\ EOT" +.It "\&005\ ENQ \t006\ ACK \t007\ BEL \t010\ BS \t011\ HT" +.It "\&012\ NL \t013\ VT \t014\ NP \t015\ CR \t016\ SO" +.It "\&017\ SI \t020\ DLE \t021\ DC1 \t022\ DC2 \t023\ DC3" +.It "\&024\ DC4 \t025\ NAK \t026\ SYN \t027\ ETB \t030\ CAN" +.It "\&031\ EM \t032\ SUB \t033\ ESC \t034\ FS \t035\ GS" +.It "\&036\ RS \t037\ US \t177\ DEL" .El .Sh RETURN VALUES The diff --git a/lib/libstand/libstand.3 b/lib/libstand/libstand.3 index d10d1443d1eb..1fd2c207b5cc 100644 --- a/lib/libstand/libstand.3 +++ b/lib/libstand/libstand.3 @@ -224,7 +224,8 @@ Read a line of at most .Fa size characters into .Fa buf . -Line terminating characters are stripped, and the buffer is always nul +Line terminating characters are stripped, and the buffer is always +.Dv NUL terminated. Returns the number of characters in .Fa buf if successful, or -1 if a read error occurs. @@ -429,7 +430,9 @@ Closes the pager. .Fn pager_output "char *lines" .Xc .Pp -Sends the lines in the nul-terminated buffer at +Sends the lines in the +.Dv NUL Ns +-terminated buffer at .Fa lines to the pager. Newline characters are counted in order to determine the number of lines being output (wrapped lines are not accounted for). diff --git a/share/man/man7/ascii.7 b/share/man/man7/ascii.7 index a6520850e9f5..feba23385c21 100644 --- a/share/man/man7/ascii.7 +++ b/share/man/man7/ascii.7 @@ -45,11 +45,11 @@ The .Nm octal set: .Bd -literal -offset left -000 nul 001 soh 002 stx 003 etx 004 eot 005 enq 006 ack 007 bel -010 bs 011 ht 012 nl 013 vt 014 np 015 cr 016 so 017 si -020 dle 021 dc1 022 dc2 023 dc3 024 dc4 025 nak 026 syn 027 etb -030 can 031 em 032 sub 033 esc 034 fs 035 gs 036 rs 037 us -040 sp 041 ! 042 " 043 # 044 $ 045 % 046 & 047 ' +000 NUL 001 SOH 002 STX 003 ETX 004 EOT 005 ENQ 006 ACK 007 BEL +010 BS 011 HT 012 NL 013 VT 014 NP 015 CR 016 SO 017 SI +020 DLE 021 DC1 022 DC2 023 DC3 024 DC4 025 NAK 026 SYN 027 ETB +030 CAN 031 EM 032 SUB 033 ESC 034 FS 035 GS 036 RS 037 US +040 SP 041 ! 042 " 043 # 044 $ 045 % 046 & 047 ' 050 ( 051 ) 052 * 053 + 054 , 055 - 056 . 057 / 060 0 061 1 062 2 063 3 064 4 065 5 066 6 067 7 070 8 071 9 072 : 073 ; 074 < 075 = 076 > 077 ? @@ -60,18 +60,18 @@ set: 140 ` 141 a 142 b 143 c 144 d 145 e 146 f 147 g 150 h 151 i 152 j 153 k 154 l 155 m 156 n 157 o 160 p 161 q 162 r 163 s 164 t 165 u 166 v 167 w -170 x 171 y 172 z 173 { 174 | 175 } 176 ~ 177 del +170 x 171 y 172 z 173 { 174 | 175 } 176 ~ 177 DEL .Ed .Pp The .Nm hexadecimal set: .Bd -literal -offset left -00 nul 01 soh 02 stx 03 etx 04 eot 05 enq 06 ack 07 bel -08 bs 09 ht 0a nl 0b vt 0c np 0d cr 0e so 0f si -10 dle 11 dc1 12 dc2 13 dc3 14 dc4 15 nak 16 syn 17 etb -18 can 19 em 1a sub 1b esc 1c fs 1d gs 1e rs 1f us -20 sp 21 ! 22 " 23 # 24 $ 25 % 26 & 27 ' +00 NUL 01 SOH 02 STX 03 ETX 04 EOT 05 ENQ 06 ACK 07 BEL +08 BS 09 HT 0A NL 0B VT 0C NP 0D CR 0E SO 0F SI +10 DLE 11 DC1 12 DC2 13 DC3 14 DC4 15 NAK 16 SYN 17 ETB +18 CAN 19 EM 1A SUB 1B ESC 1C FS 1D GS 1E RS 1F US +20 SP 21 ! 22 " 23 # 24 $ 25 % 26 & 27 ' 28 ( 29 ) 2a * 2b + 2c , 2d - 2e . 2f / 30 0 31 1 32 2 33 3 34 4 35 5 36 6 37 7 38 8 39 9 3a : 3b ; 3c < 3d = 3e > 3f ? @@ -82,18 +82,18 @@ set: 60 \` 61 a 62 b 63 c 64 d 65 e 66 f 67 g 68 h 69 i 6a j 6b k 6c l 6d m 6e n 6f o 70 p 71 q 72 r 73 s 74 t 75 u 76 v 77 w -78 x 79 y 7a z 7b { 7c | 7d } 7e ~ 7f del +78 x 79 y 7a z 7b { 7c | 7d } 7e ~ 7f DEL .Ed .Pp The .Nm decimal set: .Bd -literal -offset left - 0 nul 1 soh 2 stx 3 etx 4 eot 5 enq 6 ack 7 bel - 8 bs 9 ht 10 nl 11 vt 12 np 13 cr 14 so 15 si - 16 dle 17 dc1 18 dc2 19 dc3 20 dc4 21 nak 22 syn 23 etb - 24 can 25 em 26 sub 27 esc 28 fs 29 gs 30 rs 31 us - 32 sp 33 ! 34 " 35 # 36 $ 37 % 38 & 39 ' + 0 NUL 1 SOH 2 STX 3 ETX 4 EOT 5 ENQ 6 ACK 7 BEL + 8 BS 9 HT 10 NL 11 VT 12 NP 13 CR 14 SO 15 SI + 16 DLE 17 DC1 18 DC2 19 DC3 20 DC4 21 NAK 22 SYN 23 ETB + 24 CAN 25 EM 26 SUB 27 ESC 28 FS 29 GS 30 RS 31 US + 32 SP 33 ! 34 " 35 # 36 $ 37 % 38 & 39 ' 40 ( 41 ) 42 * 43 + 44 , 45 - 46 . 47 / 48 0 49 1 50 2 51 3 52 4 53 5 54 6 55 7 56 8 57 9 58 : 59 ; 60 < 61 = 62 > 63 ? @@ -104,7 +104,7 @@ set: 96 ` 97 a 98 b 99 c 100 d 101 e 102 f 103 g 104 h 105 i 106 j 107 k 108 l 109 m 110 n 111 o 112 p 113 q 114 r 115 s 116 t 117 u 118 v 119 w -120 x 121 y 122 z 123 { 124 | 125 } 126 ~ 127 del +120 x 121 y 122 z 123 { 124 | 125 } 126 ~ 127 DEL .Ed .Sh FILES .Bl -tag -width /usr/share/misc/ascii -compact diff --git a/usr.bin/hexdump/hexdump.1 b/usr.bin/hexdump/hexdump.1 index a004c1d6737a..b53d47f85425 100644 --- a/usr.bin/hexdump/hexdump.1 +++ b/usr.bin/hexdump/hexdump.1 @@ -253,12 +253,12 @@ displayed using the following, lower-case, names. Characters greater than 0xff, hexadecimal, are displayed as hexadecimal strings. .Bl -column \&000_nu \&001_so \&002_st \&003_et \&004_eo -.It "\&000\ nul\t001\ soh\t002\ stx\t003\ etx\t004\ eot\t005\ enq -.It "\&006\ ack\t007\ bel\t008\ bs\t009\ ht\t00A\ lf\t00B\ vt -.It "\&00C\ ff\t00D\ cr\t00E\ so\t00F\ si\t010\ dle\t011\ dc1 -.It "\&012\ dc2\t013\ dc3\t014\ dc4\t015\ nak\t016\ syn\t017\ etb -.It "\&018\ can\t019\ em\t01A\ sub\t01B\ esc\t01C\ fs\t01D\ gs -.It "\&01E\ rs\t01F\ us\t0FF\ del +.It "\&000\ NUL\t001\ SOH\t002\ STX\t003\ ETX\t004\ EOT\t005\ ENQ +.It "\&006\ ACK\t007\ BEL\t008\ BS\t009\ HT\t00A\ LF\t00B\ VT +.It "\&00C\ FF\t00D\ CR\t00E\ SO\t00F\ SI\t010\ DLE\t011\ DC1 +.It "\&012\ DC2\t013\ DC3\t014\ DC4\t015\ NAK\t016\ SYN\t017\ ETB +.It "\&018\ CAN\t019\ EM\t01A\ SUB\t01B\ ESC\t01C\ FS\t01D\ GS +.It "\&01E\ RS\t01F\ US\t0FF\ DEL .El .El .Pp diff --git a/usr.bin/hexdump/od.1 b/usr.bin/hexdump/od.1 index 5ea01640374f..ed43c4ed20fb 100644 --- a/usr.bin/hexdump/od.1 +++ b/usr.bin/hexdump/od.1 @@ -149,13 +149,13 @@ is a string containing one or more of the following kinds of type specifiers: Named characters .Pq Tn ASCII . Control characters are displayed using the following names: -.Bl -column "000 nul" "001 soh" "002 stx" "003 etx" "004 eot" "005 enq" -.It "000 nul 001 soh 002 stx 003 etx 004 eot 005 enq" -.It "006 ack 007 bel 008 bs 009 ht 00A nl 00B vt" -.It "00C ff 00D cr 00E so 00F si 010 dle 011 dc1" -.It "012 dc2 013 dc3 014 dc4 015 nak 016 syn 017 etb" -.It "018 can 019 em 01A sub 01B esc 01C fs 01D gs" -.It "01E rs 01F us 020 sp 0FF del" +.Bl -column "000 NUL" "001 SOH" "002 STX" "003 ETX" "004 EOT" "005 ENQ" +.It "000 NUL 001 SOH 002 STX 003 ETX 004 EOT 005 ENQ" +.It "006 ACK 007 BEL 008 BS 009 HT 00a NL 00b VT" +.It "00c FF 00d CR 00e SO 00f SI 010 DLE 011 DC1" +.It "012 DC2 013 DC3 014 DC4 015 NAK 016 SYN 017 ETB" +.It "018 CAN 019 EM 01a SUB 01b ESC 01c FS 01d GS" +.It "01e RS 01f US 020 SP 0ff DEL" .El .It Cm c Characters in the default character set.