Hi,
When taking over bvi packaging in Debian, I ended up with a
couple of modifications from upstream bvi source code which
might be of interest, as our linter lintian caught a couple of
typos and warnings out of the manual pages rendering. The
latest version of the patch set is available on salsa, and you
will find the changes inline below for your convenience
(assuming I don't get caught by formatting trickery).
Note that some hunks may or may not be suitable with rcs, in
which case you may prefer to exclude them from the final
correction, and I would be fine this way. I'm not an user of
rcs, I'm afraid.
Have a nice day, :)
Étienne.
PS: sorry I took more than a year to identify the correct issue
tracking place as I initially sent a private email. Anyway,
it should be fine now.
--- bvi.orig/bmore.1
+++ bvi/bmore.1
@@ -1,3 +1,5 @@
+.ds L' '
+.ds R' '
.TH BMORE 1 "8 Feb 2022"
.SH NAME
bmore \- browse through a binary file
@@ -232,7 +234,7 @@
edited using erase and kill characters.
Erasing back past the first column cancels the search command.
.TP
-.B \'
+.B '
Single quote. Go to the point from which the last search started.
If no search has been performed in the current file,
go to the beginning of the file.
--- bvi.orig/bvi.1
+++ bvi/bvi.1
@@ -1,8 +1,8 @@
.rn '' }`
-''' $RCSfile$$Revision$$Date$
-'''
-''' $Log$
-'''
+.\" $RCSfile$$Revision$$Date$
+.\"
+.\" $Log$
+.\"
.de Sh
.br
.if t .Sp
@@ -31,12 +31,12 @@
.fi
..
-'''
-'''
-''' Set up \*(-- to give an unbreakable dash;
-''' string Tr holds user defined translation string.
-''' Bell System Logo is used as a dummy character.
-'''
+.\"
+.\"
+.\" Set up \*(-- to give an unbreakable dash;
+.\" string Tr holds user defined translation string.
+.\" Bell System Logo is used as a dummy character.
+.\"
.tr \(*W-|\(bv\*(Tr
.ie n \{\
.ds -- \(*W-
@@ -45,10 +45,10 @@
.if (\n(.H=4u)&(1m=20u) .ds -- \(*W\h'-12u'\(*W\h'-8u'-\" diablo 12 pitch
.ds L" ""
.ds R" ""
-''' \*(M", \*(S", \*(N" and \*(T" are the equivalent of
-''' \*(L" and \*(R", except that they are used on ".xx" lines,
-''' such as .IP and .SH, which do another additional levels of
-''' double-quote interpretation
+.\" \*(M", \*(S", \*(N" and \*(T" are the equivalent of
+.\" \*(L" and \*(R", except that they are used on ".xx" lines,
+.\" such as .IP and .SH, which do another additional levels of
+.\" double-quote interpretation
.ds M" """
.ds S" """
.ds N" """""
@@ -273,7 +273,7 @@
\*(L"newline\*(R" and \*(L"carriage return\*(R" are not special, id est they
never mark the end of lines. Therefore the lines on the screen do not
represent lines in the usual way. Data is broken across screen lines
-arbitarily.
+arbitrarily.
As a consequence there are no commands in bvi from ex or vi
that are based on line numbers, eg \*(L"dd\*(R", \*(L"yy\*(R", \*(L'C\*(R', \*(L'S\*(R', \*(L'o\*(R', \*(L'O\*(R'.
This also changes the meaning of \*(L"range\*(R" before the \*(L":write\*(R" command
@@ -313,7 +313,7 @@
.Ve
Additional search commands:
Similar to the text search commands there are additional hex-search
-functions \*(L'\e\*(R' and \*(L'#\*(R' which allow to search for any byte value.
+functions \*(L'\e\*(R' and \*(L'#\*(R' which allow one to search for any byte value.
Example: \*(L"\e62 76 69\*(R" will search for the string \*(L"bvi\*(R".
Spaces between hex value are optional, so searching
for \*(L"6775636B6573\*(R" will find \*(L"guckes\*(R".
@@ -584,7 +584,7 @@
\& ignorecase noic Ignores letter case in searching
\& magic nomagic Makes . [ * special in patterns
\& memmove nomm enables insert and delete commands
-\& offset of=0 adds an offset to the diplayed addresses
+\& offset of=0 adds an offset to the displayed addresses
\& readonly noro If set, write fails unless you use ! after command
\& reverse nore display otherwise-printable characters with their
\& high bit set as reverse video
--- bvi.orig/bvi.c
+++ bvi/bvi.c
@@ -248,7 +248,7 @@
break;
case BLOCK_BEGIN|BLOCK_END|BLOCK_LEN:
if (block_end - block_begin != block_size + 1) {
- fprintf(stderr, "Ambigous block data\n");
+ fprintf(stderr, "Ambiguous block data\n");
exit(1);
}
break;
--- bvi.orig/comm.c
+++ bvi/comm.c
@@ -72,8 +72,8 @@
char *nowrtmsg = "No write@since last change (:%s! overrides)";
char *morefiles = "more files@to edit";
-char *ambigous = "Ambigous|Too many file names";
-char *ambvalue = "Ambigous|Too many values";
+char *ambigous = "Ambiguous|Too many file names";
+char *ambvalue = "Ambiguous|Too many values";
char *extra = "Extra chars|Extra characters at end of command";
char *noaddr = "No address allowed@on this command";
char *noval = "No value@for binary operation";
--- bvi.orig/tags
+++ bvi/tags
@@ -188,8 +188,8 @@
again recomp.c /^int again = 0;$/;" v typeref:typename:int
alloc_buf io.c /^alloc_buf(n, buffer)$/;" f
altfile comm.c /^static char *altfile = NULL; \/* alternate file *\/$/;" v typeref:typename:char * file:
-ambigous comm.c /^char *ambigous = "Ambigous|Too many file names";$/;"v typeref:typename:char *
-ambvalue comm.c /^char *ambvalue = "Ambigous|Too many values";$/;" vtyperef:typename:char *
+ambigous comm.c /^char *ambigous = "Ambiguous|Too many file names";$/;" vtyperef:typename:char *
+ambvalue comm.c /^char *ambvalue = "Ambiguous|Too many values";$/;" vtyperef:typename:char *
arrnum bmore.c /^int arrnum = 0;$/;" v typeref:typename:int
arrnum bvi.c /^int arrnum = 0;$/;" v typeref:typename:int
ascii_comp recomp.c /^ascii_comp(smem, pattern)$/;" f
Fixed in 1.5.0