mirrors/bvi
1
0
Fork 0
mirror of https://github.com/vbatts/bvi.git synced 2025-07-31 14:40:27 +00:00
Code Releases Activity

bvi-1.5.0.src.tar.gz

Browse source 
6540716a1a3b2b9711635108da14b26baea488881d4a682121c0bddbba6b74cb  bvi-1.5.0.src.tar.gz

Signed-off-by: Vincent Batts <vbatts@hashbangbash.com>
This commit is contained in:
Gerhard Bürgmann 2025-07-27 10:02:07 -04:00 • committed by Vincent Batts
parent 75fc14b579
commit 50898d8d59
Signed by: vbatts
GPG key ID: E30EFAA812C6E5ED
28 changed files with 1936 additions and 1473 deletions
Download patch file Download diff file Expand all files Collapse all files

23
CHANGES
View file

@ -1,9 +1,20 @@
New in release 1.5.0
====================
* Terminal window resizeable
* fix build fails with gcc-15/C23
* fix statusline for small windows
* various issues caught by lintian solved
* fix old-style-definition warnings
* Minor fixes
New in release 1.4.2
====================
This release is dedicated to Sven Guckes (*1967-04-06 +2022-02-20).
Sven was an enthusiastic Linux explainer, his particular passion was the console tools.
Sven was an enthusiastic Linux explainer, his particular passion was the console tools.
I met Sven a couple of times. He always showed interest in the further development of
the bvi and liked to discuss new ideas.
the bvi and liked to discuss new ideas.
R.I.P. Sven
* :wq bug fixed
@ -29,7 +40,7 @@ New in release 1.4.1rc
* Compile warning: implicit declaration of function ‘save_chk’ fixed (SF bug #9)
* bmore seg fault on file not found fixed
* set columns prevents filename display on the commandline fixed (SF bug #8)
* bmore new option -r
* bmore new option -r
bvi new setting: set reverse
Characters between 160 - 254 are displayed as "reverse video text" as used in
some legacy systems (Atari, Commodore, Apple II, etc).
@ -128,9 +139,9 @@ New in release 1.3.0
* Reading of Block Special Files
* New Command line options:
+cmd
-b begin \
-e end > for partial file read
-s size /
-b begin \
-e end > for partial file read
-s size /
* :e# bug fixed
* Debian bug #68436 (Buffer overflow in io.c) fixed

6
CREDITS
View file

@ -1,7 +1,7 @@
Patches:
Guido <guido@bearix.oche.de> sys_errlist
Christian "naddy" Weisgerber <naddy@mips.rhein-neckar.de> {Free,Open}BSD
Gunnar Larisch <la@softing.com> ^ZZ bug
Etienne Mollier <emollier@debian.org> gcc-15/C23 issues
Matthias Klose <doko@debian.org> GCC-15 issues
Vincent Batts <vbatts@hashbangbash.com> nit cleanup
Peter J. Holzer <hjp@wsr.ac.at> setlocale
Albert Chin-A-Young <china@thewrittenword.com> Makefile.in
Ralf <rks@ffm.tc.iot.dtag.de> AIX fixes

2
Makefile.in
View file

@ -8,7 +8,7 @@
#
# Copyright (c) 1996-2022 by Gerhard Buergmann
# gerhard@puon.at
#
#
# 1996-01-18 V 1.0.0
# 1999-01-15 V 1.1.0
# 1999-03-03 V 1.1.1

14
README
View file

@ -9,12 +9,12 @@ and is distributed under the GPL (GNU Public License).
How to compile
==============
You need the curses (ncurses) library for cursor movement on your system.
You need the curses (ncurses) library for cursor movement on your system.
https://www.cyberciti.biz/faq/linux-install-ncurses-library-headers-on-debian-ubuntu-centos-fedora/
gunzip -c bvi-1.4.2.src.tar.gz | tar xvf -
cd bvi-1.4.2
gunzip -c bvi-1.5.0.src.tar.gz | tar xvf -
cd bvi-1.5.0
./configure
make
make install
@ -32,14 +32,6 @@ To avoid this behaviour use:
stty dsusp undef
---------------------------------------------------------------------------
Subscribe to the bvi mailing for support, updates and other news:
Send a blank email to bvi-subscribe@yahoogroups.com. You will receive a
subscription confirmation message. Simply reply this message and your
subscription will be complete.
---------------------------------------------------------------------------
PLEASE send any bug reports (and fixes), code for new features,
comments, questions, etc. (even flames) to:

2
acconfig.h
View file

@ -10,4 +10,4 @@
#undef NEED_PUTC_CHAR
#undef HAVE_NCURSES_TERM_H
#undef HAVE_NCURSES_TERM_H

2
bm_dos.c
View file

@ -126,7 +126,7 @@ cleartoeol()
int
vgetc()
{
return ((char)bioskey(0));
return ((char)bioskey(0));
}

23
bm_unix.c
View file

@ -7,10 +7,11 @@
* 2010-06-02 V 1.3.4
* 2013-08-22 V 1.4.0
* 2019-10-09 V 1.4.1
* 2025-07-19 V 1.5.0
*
* NOTE: Edit this file with tabstop=4 !
*
* Copyright 1996-2019 by Gerhard Buergmann
* Copyright 1996-2025 by Gerhard Buergmann
* gerhard@puon.at
*
* This program is free software; you can redistribute it and/or modify it
@ -64,8 +65,7 @@ putchr(char ch)
#else
int
putchr(ch)
int ch;
putchr(int ch)
{return putchar(ch);}
#endif
@ -116,7 +116,7 @@ initterm()
no_intty = tcgetattr(fileno(stdin), &ostate);
tcgetattr(fileno(stderr), &ostate);
nstate = ostate;
if (!no_tty) {
ostate.c_lflag &= ~(ICANON|ECHO);
@ -143,8 +143,7 @@ reset_tty()
void
sig(sig)
int sig;
sig(int sig)
{
reset_tty();
printf("\r\n");
@ -156,12 +155,15 @@ sig(sig)
* doshell() - run a command or an interactive shell
*/
void
doshell(cmd)
char *cmd;
doshell(char *cmd)
{
int ret;
#ifndef DJGPP
#ifdef __STDC__
char *getenv(const char *);
#else
char *getenv();
#endif
char *shell;
char cline[128];
#endif
@ -277,10 +279,7 @@ vgetc()
* Copy contents of memory (with possible overlapping).
*/
char *
memmove(s1, s2, n)
char *s1;
char *s2;
size_t n;
memmove(char *s1, char *s2, size_t n)
{
bcopy(s2, s1, n);
return(s1);

6
bmore.1
View file

@ -1,4 +1,4 @@
.TH BMORE 1 "8 Feb 2022"
.TH BMORE 1 "24 May 2025"
.SH NAME
bmore \- browse through a binary file
.SH SYNOPSIS
@ -77,7 +77,7 @@ except that a header is printed before each file in a series.
.SH OPTIONS
.TP
.B \-a
ASCII mode: no hex representation of the contents. Non printable
ASCII mode: no hex representation of the contents. Non printable
characters are displayed as a dot (.)
.TP
.B \-c
@ -232,7 +232,7 @@ in the file remains unchanged. Regular expressions can be
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.

80
bmore.c
View file

@ -9,8 +9,9 @@
* 2013-08-23 V 1.4.0
* 2019-01-22 V 1.4.1
* 2023-03-06 V 1.4.2
* 2025-07-19 V 1.5.0
*
* Copyright 1990-2023 by Gerhard Buergmann
* Copyright 1990-2025 by Gerhard Buergmann
* gerhard@puon.at
*
* NOTE: Edit this file with tabstop=4 !
@ -113,9 +114,7 @@ usage()
int
main(argc, argv)
int argc;
char *argv[];
main(int argc, char *argv[])
{
int ch, ch1;
int colon = 0, last_ch = 0;
@ -141,7 +140,7 @@ main(argc, argv)
#endif
poi = strrchr(argv[0], DELIM);
if (poi) strncpy(progname, ++poi, 9);
else strncpy(progname, argv[0], 9);
strtok(progname, ".");
@ -177,7 +176,7 @@ main(argc, argv)
break;
case 'r': r_flag++;
break;
default:
default:
usage();
}
i++;
@ -340,7 +339,7 @@ main(argc, argv)
fclose(curr_file);
reset_tty();
exit(exval);
case ':' :
case ':' :
switch (colon) {
case 'f':
prompt = 0;
@ -449,7 +448,7 @@ main(argc, argv)
bytepos = screen_home;
to_print = maxy;
break;
case '\\':
case '\\':
if (ascii_flag) {
bmbeep();
break;
@ -460,13 +459,13 @@ main(argc, argv)
if (rdline(ch, sstring)) break;
}
case 'n': /**** Search Next ****/
case 'N':
case 'N':
bmsearch(ch);
/*
to_print--;
*/
break;
case '\'':
case '\'':
if (no_intty) {
bmbeep();
} else {
@ -493,7 +492,7 @@ main(argc, argv)
break;
}
while ((ch1 = getc(help_file)) != EOF)
putchar(ch1);
putchar(ch1);
fclose(help_file);
to_print = 0;
break;
@ -502,13 +501,13 @@ main(argc, argv)
if (!no_intty) {
cleartoeol();
if (ch == 'v') {
sprintf(string, "bvi +%lu %s",
(unsigned long)(screen_home +
sprintf(string, "bvi +%lu %s",
(unsigned long)(screen_home +
(maxy + 1) / 2 * out_len), name);
} else {
if (precount < 1) precount = bytepos - screen_home;
sprintf(string, "bvi -b %lu -s %lu %s",
(unsigned long)screen_home,
(unsigned long)screen_home,
(unsigned long)precount, name);
}
doshell(string);
@ -533,9 +532,7 @@ main(argc, argv)
int
rdline(ch, sstring)
int ch;
char *sstring;
rdline(int ch, char *sstring)
{
int i = 0;
int ch1 = 0;
@ -587,8 +584,7 @@ rdline(ch, sstring)
void
do_next(n)
int n;
do_next(int n)
{
if (numfiles) {
if (n == 1 && file_nr == numfiles) {
@ -614,8 +610,7 @@ do_next(n)
int
open_file(name)
char *name;
open_file(char *name)
{
struct stat buf;
@ -636,9 +631,7 @@ open_file(name)
void
putline(buf, num)
char *buf;
int num;
putline(char *buf, int num)
{
int print_pos;
unsigned char ch;
@ -649,31 +642,31 @@ putline(buf, num)
if (!ascii_flag) {
for (print_pos = 0; print_pos < num; print_pos++) {
ch = buf[print_pos];
PRINTF("%02X ", ch);
PRINTF("%02X ", ch);
}
for (; print_pos < out_len; print_pos++) {
PRINTF(" ");
PRINTF(" ");
}
PRINTF(" ");
}
// ASCII section
for (print_pos = 0; print_pos < num; print_pos++) {
++bytepos;
ch = buf[print_pos];
if ((ch > 31) && (ch < 127)) {
PRINTF("%c", ch);
PRINTF("%c", ch);
} else {
if (r_flag) {
if ((ch & 128) && ((ch > 159) && (ch < 255))) {
if (!no_tty) highlight();
PRINTF("%c", ch & 127);
PRINTF("%c", ch & 127);
if (!no_tty) normal();
} else {
PRINTF(".");
PRINTF(".");
}
} else {
PRINTF(".");
PRINTF(".");
}
}
}
@ -689,13 +682,12 @@ putline(buf, num)
int
printout(lns)
int lns;
printout(int lns)
{
int c, num;
int doub = 0;
static int flag;
if (c_flag) {
clearscreen();
}
@ -755,9 +747,7 @@ nextchar()
void
pushback(n, where)
int n;
char *where;
pushback(int n, char *where)
{
if (cnt) memmove(cmdbuf + n, cmdbuf, n);
memcpy(cmdbuf, where, n);
@ -774,8 +764,7 @@ pushback(n, where)
* 1 found
*/
int
bmregexec(scan)
char *scan;
bmregexec(char *scan)
{
char *act;
int count, test;
@ -869,7 +858,7 @@ bmregexec(scan)
pushback(1, --act);
l--;
}
} else { /* ".*" */
} else { /* ".*" */
do {
if ((test = nextchar()) == -1) return -5;
*act++ = test;
@ -893,10 +882,7 @@ bmregexec(scan)
int
sbracket(start, scan, count)
int start;
char *scan;
int count;
sbracket(int start, char *scan, int count)
{
if (*scan++ == '^') {
if (!memchr(scan, start, --count)) return 0;
@ -908,8 +894,7 @@ sbracket(start, scan, count)
void
bmsearch(ch)
int ch;
bmsearch(int ch)
{
int i;
@ -961,8 +946,7 @@ emsg(string);
void
emsg(s)
char *s;
emsg(char *s)
{
putchar('\r');
cleartoeol();

22
bmore.h
View file

@ -7,7 +7,7 @@
* 1999-08-21 V 1.2.0 final
* 2000-05-31 V 1.3.0 beta
* 2000-10-04 V 1.3.0 final
* 2002-01-16 V 1.3.1
* 2002-01-16 V 1.3.1
* 2003-02-20 V 1.3.2
* 2010-03-28 V 1.3.4
* 2019-01-22 V 1.4.1
@ -43,7 +43,7 @@
#if defined(__MSDOS__) && !defined(DJGPP)
# include "patchlev.h"
# include "dosconf.h"
# include <alloc.h>
# include <alloc.h>
# include <conio.h>
# include <bios.h>
#else
@ -51,21 +51,21 @@
# include "config.h"
# include <unistd.h>
# if defined HAVE_NCURSESW_CURSES_H
# include <ncursesw/curses.h>
# include <ncursesw/term.h>
# include <ncursesw/curses.h>
# include <ncursesw/term.h>
# elif defined HAVE_NCURSESW_H
# include <ncursesw.h>
# include <ncursesw.h>
# elif defined HAVE_NCURSES_CURSES_H
# include <ncurses/curses.h>
# include <ncurses/curses.h>
# elif defined HAVE_NCURSES_H
# include <ncurses.h>
# include <ncurses.h>
# elif defined HAVE_CURSES_H
# include <curses.h>
# include <curses.h>
# else
# error "SysV or X/Open-compatible Curses header file required"
# error "SysV or X/Open-compatible Curses header file required"
# endif
# if HAVE_TERM_H
# include <term.h>
# include <term.h>
# endif
#endif
@ -136,7 +136,7 @@ extern int no_tty, no_intty;
#ifdef ANSI
#if defined(ANSI) || defined(__STDC__)
void initterm(void), set_tty(void), reset_tty(void);
void cleartoeol(void), clearscreen(void), highlight(void);
void normal(void), bmbeep(void), home(void), sig(int);

77
bvi.1
View file

@ -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" """""
@ -79,9 +79,9 @@
'br\}
.\" If the F register is turned on, we'll generate
.\" index entries out stderr for the following things:
.\" TH Title
.\" TH Title
.\" SH Header
.\" Sh Subsection
.\" Sh Subsection
.\" Ip Item
.\" X<> Xref (embedded
.\" Of course, you have to process the output yourself
@ -93,7 +93,7 @@
.nr % 0
.rr F
.\}
.TH BVI 1 "BVI Version 1.4.2" "8/Feb/2022" "User Commands"
.TH BVI 1 "BVI Version 1.5.0" "31/May/2025" "User Commands"
.IX Title "BVI 1"
.UC
.IX Name "bvi, bview - visual display editor for binary files"
@ -194,7 +194,7 @@
bvi, bview \- visual editor for binary files
.SH "VERSION"
.IX Header "VERSION"
bvi-1.4.1
bvi-1.5.0
.SH "SYNOPSIS"
.IX Header "SYNOPSIS"
\fBbvi\fR\ \ \ [\fB\-R\fR]\ [\fB\-c\fR\ \fIcmd\fR]\ [\fB\-f\fR\ \fIscript\fR]\ [\fB\-s\fR\ \fIskip\fR]\ [\fB\-e\fR\ \fIend\fR]\ [\fB\-n\fR\ \fIlength\fR]\ \fIfile\fR...
@ -203,10 +203,10 @@ bvi-1.4.1
.IX Header "OPTIONS"
.Ip "\fIfile\fR..." 4
.IX Item "\fIfile\fR..."
A list of filenames. The first one will be the current file and
will be read
A list of filenames. The first one will be the current file and
will be read
into the buffer. The cursor will be positioned on the first line of
the buffer. You can get to the other files with the ":next" command.
the buffer. You can get to the other files with the ":next" command.
.Ip "\fB\-R\fR" 4
.IX Item "\fB\-R\fR"
\*(L"Readonly": The readonly flag is set for all the files,
@ -261,7 +261,7 @@ The byte offset (extreme left), the hex pane (middle),
and an ascii pane (right) which shows as printable characters
those bytes in the hex pane.
On an 80 column terminal there will be sixteen hex values
and their ASCII values on each screen line.
and their ASCII values on each screen line.
Note that (as one would expect) the first byte has the offset \*(L'0\*(R' (zero).
.PP
You can toggle between the hex and ascii windows with the tab key (TAB).
@ -270,10 +270,10 @@ position (offset) within the file.
.PP
No \*(L"lines\*(R" concept:
Files are treated as one long stream of bytes. The characters
\*(L"newline\*(R" and \*(L"carriage return\*(R" are not special, id est they
\*(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,13 +313,13 @@ using these meta sequences:
.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".
.PP
Changing the length of data (insertion, deletion) moves the data to other addresses;
this is bad for many cases (eg. databases, program files) and is
this is bad for many cases (eg. databases, program files) and is
thus disabled by default. You can enable this commands by typing
.PP
\f(CW :set memmove\fR
@ -334,11 +334,11 @@ Use ESC (escape) to cancel a partial (uncompleted) command.
.PP
Input Mode:
.PP
Input is treated as replacement of current characters or
Input is treated as replacement of current characters or
(after the end of the file) is appended
to the current file. This mode is entered from command mode by
typing one of \*(L'i\*(R', \*(L'I\*(R', \*(L'A\*(R', \*(L'r\*(R', or \*(L'R\*(R'.
You can enter the characters from the keyboard (in the ASCII window) or
You can enter the characters from the keyboard (in the ASCII window) or
hexadecimal values (in the HEX window).
Type TAB to switch between these two windows.
Type ESC to finish the current input and return to command mode.
@ -346,8 +346,8 @@ Type CTRL\-C to cancel current command abnormally.
.PP
Command line mode (Last Line Mode or : mode):
.PP
Similar to vi, this mode is entered by typing one of the
characters
Similar to vi, this mode is entered by typing one of the
characters
: / ? \e # !
The command is terminated and executed by typing a carriage
return; to cancel a partially typed command, type
@ -439,10 +439,10 @@ used within the following description of commands.
You can insert/append/change bytes in ASCII/binary/decimal/
hexadecimal or octal representation. You can enter several
(screen) lines of input. A line with only a period (.) in it
will terminate the command. You must not type in values greater
will terminate the command. You must not type in values greater
than a byte value. This causes an abandonment of the command.
Pressing the CR key does not insert a newline \- character into
the file. If you use ASCII mode you can use the special characters
the file. If you use ASCII mode you can use the special characters
\en, \er, \et and \e0.
.PP
.Vb 3
@ -507,7 +507,7 @@ the file. If you use ASCII mode you can use the special characters
`\fIx\fR move cursor to mark \fIx\fR in HEX section
\*(L'\*(R' move cursor to previous context in ASCII section
`` move cursor to previous context in HEX section
\fBLine positioning:\fR
H jump to first line on screen ("top")
L jump to last line on screen ("low")
@ -554,7 +554,7 @@ the file. If you use ASCII mode you can use the special characters
rx replace current bte with char \*(L'x\*(R'
R enter replace mode; for all subsequent input,
the current byte is overwritten with the next
input character; leave replace mode with ESC.
input character; leave replace mode with ESC.
.PP
\fBMiscellaneous Operations:\fR
TAB toggle between ASCII and HEX section
@ -583,8 +583,8 @@ the file. If you use ASCII mode you can use the special characters
\& columns cm=16 on an 80 character wide terminal
\& 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
\& memmove nomm enables insert and delete commands
\& 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
@ -606,7 +606,7 @@ bvi was developed by Gerhard Buergmann, Vienna, Austria
\fIgerhard@puon.at\fR
.SH "WWW"
.IX Header "WWW"
Bvi\ Homepage:\ \ http://bvi.sourceforge.net/
Bvi\ Homepage:\ \ https://bvi.sourceforge.net/
Vi\ Pages:\ \ \ \ \ \ http://www.guckes.net/vi/clones.php3
\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ (all\ about\ Vi\ and\ its\ clones)
.SH "FILES"
@ -614,9 +614,6 @@ Vi\ Pages:\ \ \ \ \ \ http://www.guckes.net/vi/clones.php3
\fI\ $HOME/.bvirc\fR\ \ \ \ \ \ \ \ \ \ editor\ startup\ file
.BR
\fI\ ./.bvirc\fR\ \ \ \ \ \ \ \ \ \ \ \ \ \ editor\ startup\ file
.SH "BUGS"
.IX Header "BUGS"
Bvi does not update the screen when the terminal changes its size.
.SH "SEE ALSO"
.IX Header "SEE ALSO"
\fIbmore\fR\|(1), \fIvi\fR\|(1), \fIstrings\fR\|(1), \fIascii\fR\|(5)

156
bvi.c
View file

@ -2,7 +2,7 @@
*
* 1996-02-28 V 1.0.0
* 1999-01-27 V 1.1.0
* 1999-04-22 V 1.1.1
* 1999-04-22 V 1.1.1
* 1999-07-01 V 1.2.0 beta
* 1999-10-22 V 1.2.0 final
* 2000-05-10 V 1.3.0 alpha
@ -14,10 +14,11 @@
* 2014-10-07 V 1.4.0
* 2019-10-12 V 1.4.1
* 2023-03-06 V 1.4.2
* 2025-07-19 V 1.5.0
*
* NOTE: Edit this file with tabstop=4 !
*
* Copyright 1996-2023 by Gerhard Buergmann
* Copyright 1996-2025 by Gerhard Buergmann
* gerhard@puon.at
*
* This program is free software; you can redistribute it and/or modify it
@ -44,55 +45,56 @@
#endif
char *copyright = "(C) GPL 1996-2023 by Gerhard Buergmann";
char *copyright = "(C) GPL 1996-2025 by Gerhard Buergmann";
jmp_buf env; /* context for `longjmp' function */
int loc;
int maxx, maxy, x, xx, y;
int screen, status, statsize;
int loc;
int maxx, maxy, x, xx, y;
int screen, status, statsize;
off_t size;
PTR mem = NULL;
PTR curpos;
PTR maxpos;
PTR pagepos;
PTR spos;
PTR mem = NULL;
PTR curpos;
PTR maxpos;
PTR pagepos;
PTR spos;
char *name = NULL;
char *shell;
char string[MAXCMD+1];
char cmdstr[MAXCMD+1] = "";
FILE *Ausgabe_Datei;
int edits = 0;
int AnzAdd, Anzahl, Anzahl3;
int edits = 0;
int AnzAdd, Anzahl, Anzahl3;
off_t filesize, memsize, undosize;
int statusflag = 1;
int space = 2;
long precount = -1;
int block_flag = 0;
int block_flag = 0;
off_t block_begin, block_end, block_size;
char **files; /* list of input files */
int numfiles; /* number of input files */
int curfile; /* number of the current file */
int numfiles; /* number of input files */
int curfile; /* number of the current file */
int arrnum = 0;
int arrnum = 0;
char numarr[MAXCMD+1]; /* string for collecting number */
char rep_buf[BUFFER];
PTR current;
PTR last_motion;
PTR current_start;
PTR undo_start;
PTR current;
PTR last_motion;
PTR current_start;
PTR undo_start;
off_t undo_count;
off_t yanked = 0L;
char *yank_buf = NULL;
char *undo_buf = NULL;
char *fname_buf = NULL;
PTR markbuf[26];
PTR markbuf[26];
char addr_form[15];
@ -100,8 +102,8 @@ char *nobytes = "No bytes@in the buffer";
static char progname[8];
static char line[MAXCMD+1];
static int mark;
static int wrstat = 1;
static int mark;
static int wrstat = 1;
void
@ -117,9 +119,7 @@ usage()
int
main(argc, argv)
int argc;
char *argv[];
main(int argc, char *argv[])
{
int ch;
int lflag;
@ -248,7 +248,7 @@ main(argc, argv)
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;
@ -267,7 +267,9 @@ main(argc, argv)
maxy = LINES;
if (params[P_LI].flags & P_CHANGED) maxy = P(P_LI);
P(P_SS) = maxy / 2;
/* We do not set P(P_LI) and P(P_CM) anymore, because 0 means "auto"
P(P_LI) = maxy;
*/
maxy--;
keypad(stdscr, TRUE);
scrollok(stdscr, TRUE);
@ -275,21 +277,21 @@ main(argc, argv)
cbreak();
noecho();
/* address column width */
/* default is 8 + 2 blanks */
/* if block_begin has 8 hex digits or more */
/* reserve 1 hex digit more than required */
char tmp[sizeof(block_begin) * 2 + 3];
AnzAdd = sprintf(tmp, "%llX", (long long unsigned)block_begin) + 1;
if (AnzAdd < 8)
AnzAdd = 8;
if (AnzAdd > sizeof(block_begin) * 2)
AnzAdd = sizeof(block_begin) * 2;
sprintf(addr_form, "%%0%dllX ", AnzAdd);
AnzAdd = sprintf(tmp, addr_form, block_begin);
/* address column width */
/* default is 8 + 2 blanks */
/* if block_begin has 8 hex digits or more */
/* reserve 1 hex digit more than required */
char tmp[sizeof(block_begin) * 2 + 3];
AnzAdd = sprintf(tmp, "%llX", (long long unsigned)block_begin) + 1;
if (AnzAdd < 8) AnzAdd = 8;
if (AnzAdd > sizeof(block_begin) * 2) AnzAdd = sizeof(block_begin) * 2;
sprintf(addr_form, "%%0%dllX ", AnzAdd);
AnzAdd = sprintf(tmp, addr_form, block_begin);
Anzahl = ((COLS - AnzAdd - 1) / 16) * 4;
Anzahl = ((COLS - AnzAdd - space) / 16) * 4;
/*
P(P_CM) = Anzahl;
*/
maxx = Anzahl * 4 + AnzAdd + 1;
Anzahl3 = Anzahl * 3;
statsize = 35;
@ -310,7 +312,7 @@ main(argc, argv)
if (*cmdstr != '\0')
docmdline(cmdstr);
msg(fname_buf);
/* main loop */
do {
setjmp(env);
@ -328,6 +330,10 @@ main(argc, argv)
else precount = -1;
lflag = arrnum = 0;
if (statusflag == 0) {
statusflag = 1;
clearstr();
}
switch (ch) {
case '^': x = AnzAdd;
loc = HEX;
@ -426,7 +432,7 @@ main(argc, argv)
x = AnzAdd - 1 + Anzahl3 + Anzahl;
loc = ASCII; }
break;
case ':' : clearstr();
case ':' : clearstr();
addch(ch);
refresh();
getcmdstr(cmdstr, 1);
@ -467,6 +473,18 @@ main(argc, argv)
fileinfo(name);
wrstat = 0;
break;
case KEY_RESIZE:
if (P(P_CM) == 0) {
Anzahl = ((COLS - AnzAdd - space) / 4);
maxx = Anzahl * 4 + AnzAdd + 1;
Anzahl3 = Anzahl * 3;
status = Anzahl3 + Anzahl - statsize;
}
if (P(P_LI) == 0) {
screen = Anzahl * (maxy - 1);
maxy = LINES - 1;
P(P_SS) = maxy / 2;
}
case BVICTRL('L'): /*** REDRAW SCREEN ***/
new_screen();
break;
@ -491,9 +509,9 @@ main(argc, argv)
break;
case ';': do_ft(0, 0);
break;
case 'F':
case 'f':
case 't':
case 'F':
case 'f':
case 't':
case 'T': do_ft(ch, 0);
break;
case 'G': last_motion = current;
@ -501,10 +519,10 @@ main(argc, argv)
if ((precount < P(P_OF)) ||
(precount - P(P_OF)) > (filesize - 1L)) {
beep();
} else {
} else {
setpage((PTR)(mem + precount - P(P_OF)));
}
} else {
} else {
setpage((PTR)(mem + filesize - 1L));
}
break;
@ -735,8 +753,7 @@ main(argc, argv)
off_t
calc_size(arg)
char *arg;
calc_size(char *arg)
{
off_t val;
extern int errno;
@ -756,13 +773,13 @@ calc_size(arg)
switch (*poi) {
case 'k':
case 'K': val *= 1024;
break;
break;
case 'm':
case 'M': val *= 1048576;
break;
break;
case 'g':
case 'G': val *= 1024*1024*1024LL;
break;
case 'G': val *= 1024*1024*1024LL;
break;
case '\0': break;
default: usage();
}
@ -787,9 +804,7 @@ trunc_cur()
int
do_append(count, buf)
off_t count;
char *buf;
do_append(off_t count, char *buf)
{
if (filesize + count > memsize) {
if (enlarge(count + 100L)) return 1;
@ -806,8 +821,7 @@ do_append(count, buf)
void
do_tilde(count)
off_t count;
do_tilde(off_t count)
{
if (filesize == 0L) return;
undo_start = current;
@ -893,10 +907,7 @@ do_undo()
void
do_over(loc, n, buf)
PTR loc;
off_t n;
PTR buf;
do_over(PTR loc, off_t n, PTR buf)
{
if (n < 1L) {
emsg(nobytes);
@ -918,10 +929,7 @@ do_over(loc, n, buf)
void
do_put(loc, n, buf)
PTR loc;
off_t n;
PTR buf;
do_put(PTR loc, off_t n, PTR buf)
{
if (n < 1L) {
emsg(nobytes);
@ -949,8 +957,7 @@ do_put(loc, n, buf)
/* argument sig not used, because only SIGINT will be catched */
void
jmpproc(sig)
int sig;
jmpproc(int sig)
{
if (P(P_EB)) beep();
repaint();
@ -961,8 +968,7 @@ jmpproc(sig)
off_t
range(ch)
int ch;
range(int ch)
{
int ch1;
long count;
@ -1033,7 +1039,7 @@ range(ch)
- (off_t)P(P_OF)) > (filesize - 1L)) {
beep();
return 0;
} else {
} else {
if (mem + count < current) {
return(mem + count - current);
} else {
@ -1051,9 +1057,9 @@ range(ch)
}
end_addr = markbuf[mark - 'a'];
if (end_addr == NULL) {
beep();
beep();
return 0;
}
}
if (end_addr < current) {
return(end_addr - current);
} else {

165
bvi.h
View file

@ -13,10 +13,11 @@
* 2014-10-01 V 1.4.0
* 2019-01-28 V 1.4.1
* 2023-03-07 V 1.4.2
* 2025-05-24 V 1.5.0
*
* NOTE: Edit this file with tabstop=4 !
*
* Copyright 1996-2023 by Gerhard Buergmann
* Copyright 1996-2025 by Gerhard Buergmann
* gerhard@puon.at
*
* This program is free software; you can redistribute it and/or modify it
@ -46,8 +47,8 @@
#if defined(__MSDOS__) && !defined(DJGPP)
# include "patchlev.h"
# include "dosconf.h"
# include "doscur.h"
# include <alloc.h>
# include "doscur.h"
# include <alloc.h>
#else
# include "patchlevel.h"
# include "config.h"
@ -129,14 +130,14 @@
# define ANSI
# define PTR char huge *
# define off_t long
# define DELIM '\\'
# define strncasecmp strnicmp
# define strcasecmp stricmp
# define DELIM '\\'
# define strncasecmp strnicmp
# define strcasecmp stricmp
# define memcpy d_memcpy
# define memmove d_memmove
#else
# define PTR char *
# define DELIM '/'
# define DELIM '/'
#endif
#define MAXCMD 255
@ -164,27 +165,27 @@ extern char search_pat[];
extern long hl_spat;
extern char pattern[];
extern char rep_buf[];
extern int maxx, maxy, x, y;
extern int filemode, loc;
extern int edits, new;
extern int AnzAdd;
extern int Anzahl, Anzahl3;
extern int addr_flag;
extern int ignore_case, magic;
extern int screen, status, statsize;
extern PTR mem;
extern PTR maxpos;
extern PTR pagepos;
extern PTR undo_start;
extern PTR current_start;
extern PTR curpos;
extern PTR current;
extern PTR start_addr;
extern PTR end_addr;
extern int maxx, maxy, x, y;
extern int filemode, loc;
extern int edits, new;
extern int AnzAdd;
extern int Anzahl, Anzahl3;
extern int addr_flag;
extern int ignore_case, magic;
extern int screen, status, statsize;
extern PTR mem;
extern PTR maxpos;
extern PTR pagepos;
extern PTR undo_start;
extern PTR current_start;
extern PTR curpos;
extern PTR current;
extern PTR start_addr;
extern PTR end_addr;
extern char *name, cmdstr[];
extern off_t filesize, memsize;
extern PTR markbuf[];
extern PTR last_motion;
extern PTR markbuf[];
extern PTR last_motion;
extern off_t undo_count;
extern off_t yanked;
extern off_t undosize;
@ -192,14 +193,16 @@ extern char *copyright, *notfound;
extern char *terminal;
extern char *undo_buf;
extern char *yank_buf;
extern int repl_count;
extern int repl_count;
extern char string[];
extern char *shell;
extern char *poi;
extern int smode;
extern int again;
extern int smode;
extern int again;
extern int block_flag;
extern off_t block_begin, block_end, block_size;
extern int statusflag;
extern int space;
#ifndef S_ISDIR /* POSIX 1003.1 file type tests. */
#define S_ISDIR(m) ((m & 0170000) == 0040000) /* directory */
@ -214,7 +217,7 @@ extern off_t block_begin, block_end, block_size;
void d_memmove(PTR, PTR, off_t);
#endif
#ifdef ANSI
#if defined(ANSI) || defined(__STDC__)
off_t alloc_buf(off_t, char **), yd_addr(void);
off_t range(int);
void do_dot(void), do_exit(void), do_shell(void), do_undo(void);
@ -223,26 +226,26 @@ extern off_t block_begin, block_end, block_size;
void do_mark(int, PTR), badcmd(char *), movebyte(void);
void docmdline(char *), do_over(PTR, off_t, PTR), do_put(PTR, off_t, PTR);
void jmpproc(int), printline(PTR, int);
int addfile(char *);
PTR bregexec(PTR, char *);
int chk_comm(int);
int doecmd(char *, int);
int do_append(off_t, char *), do_logic(int, char *);
int do_delete(off_t, PTR);
int doset(char *);
int do_substitution(int, char *, PTR, PTR);
int hexchar(void);
int outmsg(char *);
int save_chk(char *, char *, char *, int);
PTR searching(int, char *, PTR, PTR, int);
PTR wordsearch(PTR, char);
PTR backsearch(PTR, char);
PTR fsearch(PTR, PTR, char *);
PTR fsearch_end(PTR, PTR, char *, PTR *);
PTR rsearch(PTR, PTR, char *);
PTR end_word(PTR);
PTR calc_addr(char **, PTR);
PTR do_ft(int, int);
int addfile(char *);
PTR bregexec(PTR, char *);
int chk_comm(int);
int doecmd(char *, int);
int do_append(off_t, char *), do_logic(int, char *);
int do_delete(off_t, PTR);
int doset(char *);
int do_substitution(int, char *, PTR, PTR);
int hexchar(void);
int outmsg(char *);
int save_chk(char *, char *, char *, int);
PTR searching(int, char *, PTR, PTR, int);
PTR wordsearch(PTR, char);
PTR backsearch(PTR, char);
PTR fsearch(PTR, PTR, char *);
PTR fsearch_end(PTR, PTR, char *, PTR *);
PTR rsearch(PTR, PTR, char *);
PTR end_word(PTR);
PTR calc_addr(char **, PTR);
PTR do_ft(int, int);
char *patcpy(char *, char *, char);
void setpage(PTR), msg(char *), emsg(char *), smsg(char *);
void usage(void), bvi_init(char *), statpos(void), setcur(void);
@ -253,43 +256,43 @@ extern off_t block_begin, block_end, block_size;
off_t edit(int), load(char *);
off_t calc_size(char *);
int ascii_comp(char *, char *), hex_comp(char *, char *);
int cur_forw(int), cur_back(void);
int lineout(void), save(char *, PTR, PTR, int);
int at_least(char *, char *, int);
int vgetc(void), xpos(void), enlarge(off_t);
int getcmdstr(char *, int), read_rc(char *);
int wait_return(int);
int cur_forw(int), cur_back(void);
int lineout(void), save(char *, PTR, PTR, int);
int at_least(char *, char *, int);
int vgetc(void), xpos(void), enlarge(off_t);
int getcmdstr(char *, int), read_rc(char *);
int wait_return(int);
#else
int addfile();
int addfile();
off_t alloc_buf(), yd_addr();
off_t range();
off_t calc_size();
void do_mark(), badcmd(), movebyte();
void do_back(), do_ins_chg();
void jmpproc(), printline();
int chk_comm();
int chk_comm();
void docmdline(), do_over(), do_put();
int doecmd();
int doecmd();
void do_dot(), do_exit(), do_shell(), do_undo();
void do_tilde(), trunc_cur();
int do_append(), do_logic();
int do_delete();
int doset();
int do_substitution();
int hexchar();
int outmsg();
int save_chk();
PTR searching();
PTR wordsearch();
PTR backsearch();
int do_append(), do_logic();
int do_delete();
int doset();
int do_substitution();
int hexchar();
int outmsg();
int save_chk();
PTR searching();
PTR wordsearch();
PTR backsearch();
/* int bregexec(); */
PTR bregexec();
PTR fsearch();
PTR fsearch_end();
PTR rsearch();
PTR end_word();
PTR calc_addr();
PTR do_ft();
PTR bregexec();
PTR fsearch();
PTR fsearch_end();
PTR rsearch();
PTR end_word();
PTR calc_addr();
PTR do_ft();
char *patcpy();
void setpage(), msg(), emsg(), smsg();
void usage(), bvi_init(), statpos(), setcur();
@ -299,9 +302,9 @@ extern off_t block_begin, block_end, block_size;
void quit(), sysemsg(), do_z(), stuffin();
off_t edit(), load();
int ascii_comp(), hex_comp();
int cur_forw(), cur_back();
int lineout(), save(), at_least(), read_rc();
int getcmdstr(), enlarge();
int vgetc(), xpos();
int wait_return();
int cur_forw(), cur_back();
int lineout(), save(), at_least(), read_rc();
int getcmdstr(), enlarge();
int vgetc(), xpos();
int wait_return();
#endif

94
comm.c
View file

@ -8,17 +8,18 @@
* 1999-09-10 V 1.2.0 final
* 2000-03-03 V 1.3.0 beta
* 2000-07-15 V 1.3.0 final
* 2001-10-10 V 1.3.1
* 2001-10-10 V 1.3.1
* 2003-07-04 V 1.3.2
* 2005-08-17 V 1.3.3
* 2010-06-02 V 1.3.4
* 2014-01-28 V 1.4.0
* 2019-01-27 V 1.4.1
* 2023-03-06 V 1.4.2
* 2025-07-19 V 1.5.0
*
* NOTE: Edit this file with tabstop=4 !
*
* Copyright 1996-2023 by Gerhard Buergmann
* Copyright 1996-2025 by Gerhard Buergmann
* gerhard@puon.at
*
* This program is free software; you can redistribute it and/or modify it
@ -72,8 +73,8 @@ static char *c_argv[9];
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";
@ -98,8 +99,7 @@ static char oldbuf[CMDSZ + 3]; /** for :!! command **/
* the environment variable "BVIINIT" (or eventually .bvirc).
*/
void
docmdline(cmdline)
char *cmdline;
docmdline(char *cmdline)
{
char buff[CMDSZ];
char cmdbuf[CMDSZ];
@ -286,22 +286,22 @@ docmdline(cmdline)
if ((c_argv[c_argc] = strtok(cmd, " \t")) != NULL) c_argc++;
while ((c_argv[c_argc] = strtok(NULL, " \t")) != NULL) c_argc++;
if (c_argc > 1) {
if (c_argc > 1) {
emsg(ambigous);
return; }
if (c_argc == 1) {
/* change '%' to Filename */
while ((p = strchr(c_argv[0], '%')) != NULL && *(p-1) != '\\') {
if (name == NULL) {
emsg("No filename@to substitute for %");
return;
}
*p = '\0';
strcpy (oldbuf, c_argv[0]);
strcat (oldbuf, name);
strcat (oldbuf, p + 1);
/* change '%' to Filename */
while ((p = strchr(c_argv[0], '%')) != NULL && *(p-1) != '\\') {
if (name == NULL) {
emsg("No filename@to substitute for %");
return;
}
*p = '\0';
strcpy (oldbuf, c_argv[0]);
strcat (oldbuf, name);
strcat (oldbuf, p + 1);
c_argv[0] = oldbuf;
}
}
}
if (name == NULL && c_argc != 0) name = strdup(c_argv[0]);
if (force) {
@ -629,11 +629,7 @@ yd_addr()
/*********** Save file if not read only ********************/
int
save_chk(fname, start, end, flags)
char *fname;
char *start;
char *end;
int flags;
save_chk(char *fname, char *start, char *end, int flags)
{
if (P(P_RO)) {
sprintf(string, "\"%s\" File is read only", name);
@ -657,9 +653,7 @@ do_exit()
int
doecmd(arg, force)
char *arg;
int force;
doecmd(char *arg, int force)
{
char *tmp;
@ -722,33 +716,34 @@ clearstr()
/**** displays an error message *****/
void
emsg(s)
char *s;
emsg(char *s)
{
int cnt;
int stchar;
/*
int stchar;
if (P(P_EB)) beep();
if (P(P_MO)) {
stchar = statsize;
} else {
stchar = 0;
}
*/
if (P(P_EB)) beep();
statusflag = 0;
clearstr();
attrset(A_REVERSE);
cnt = outmsg(s);
attrset(A_NORMAL);
if (cnt >= (maxx - stchar)) {
addch('\n');
wait_return(TRUE); }
if (cnt >= (maxx)) {
// addch('\n');
wait_return(TRUE);
}
}
/*** System error message *****/
void
sysemsg(s)
char *s;
sysemsg(char *s)
{
char string[256];
@ -764,8 +759,7 @@ sysemsg(s)
/*** displays mode if showmode set *****/
void
smsg(s)
char *s;
smsg(char *s)
{
if (P(P_MO)) {
msg(s);
@ -776,30 +770,30 @@ smsg(s)
/************* displays s on status line *****************/
void
msg(s)
char *s;
msg(char *s)
{
/*
int stchar;
if (P(P_MO)) {
stchar = statsize;
} else {
stchar = 0;
}
}o*/
statusflag = 0;
clearstr();
if (outmsg(s) >= (maxx - stchar)) {
addch('\n');
if (outmsg(s) >= maxx) {
// addch('\n');
wait_return(TRUE);
}
}
int
outmsg(s)
char *s;
outmsg(char *s)
{
char *poi;
int cnt = 0;
int cnt = 0;
move(maxy, 0);
poi = strchr(s, '|');
@ -811,7 +805,7 @@ outmsg(s)
cnt++;
}
} else {
if (poi) poi++;
if (poi) poi++;
else poi = s;
while (*poi) {
if (*poi == '@') addch(' ');
@ -828,8 +822,7 @@ outmsg(s)
*
*/
int
wait_return(flag)
int flag;
wait_return(int flag)
{
int c;
@ -852,8 +845,7 @@ wait_return(flag)
int
chk_comm(flag)
int flag;
chk_comm(int flag)
{
if ((flag & NO_ADDR) && (addr_flag > 0)) {
emsg(noaddr); return 1; }

71
config.guess vendored
View file

@ -1,10 +1,10 @@
#! /bin/sh
# Attempt to guess a canonical system name.
# Copyright 1992-2023 Free Software Foundation, Inc.
# Copyright 1992-2024 Free Software Foundation, Inc.
# shellcheck disable=SC2006,SC2268 # see below for rationale
timestamp='2023-01-01'
timestamp='2024-07-27'
# This file is free software; you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
@ -47,7 +47,7 @@ me=`echo "$0" | sed -e 's,.*/,,'`
usage="\
Usage: $0 [OPTION]
Output the configuration name of the system \`$me' is run on.
Output the configuration name of the system '$me' is run on.
Options:
-h, --help print this help, then exit
@ -60,13 +60,13 @@ version="\
GNU config.guess ($timestamp)
Originally written by Per Bothner.
Copyright 1992-2023 Free Software Foundation, Inc.
Copyright 1992-2024 Free Software Foundation, Inc.
This is free software; see the source for copying conditions. There is NO
warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
help="
Try \`$me --help' for more information."
Try '$me --help' for more information."
# Parse command line
while test $# -gt 0 ; do
@ -102,8 +102,8 @@ GUESS=
# temporary files to be created and, as you can see below, it is a
# headache to deal with in a portable fashion.
# Historically, `CC_FOR_BUILD' used to be named `HOST_CC'. We still
# use `HOST_CC' if defined, but it is deprecated.
# Historically, 'CC_FOR_BUILD' used to be named 'HOST_CC'. We still
# use 'HOST_CC' if defined, but it is deprecated.
# Portable tmp directory creation inspired by the Autoconf team.
@ -123,7 +123,7 @@ set_cc_for_build() {
dummy=$tmp/dummy
case ${CC_FOR_BUILD-},${HOST_CC-},${CC-} in
,,) echo "int x;" > "$dummy.c"
for driver in cc gcc c89 c99 ; do
for driver in cc gcc c17 c99 c89 ; do
if ($driver -c -o "$dummy.o" "$dummy.c") >/dev/null 2>&1 ; then
CC_FOR_BUILD=$driver
break
@ -155,6 +155,9 @@ Linux|GNU|GNU/*)
set_cc_for_build
cat <<-EOF > "$dummy.c"
#if defined(__ANDROID__)
LIBC=android
#else
#include <features.h>
#if defined(__UCLIBC__)
LIBC=uclibc
@ -162,6 +165,8 @@ Linux|GNU|GNU/*)
LIBC=dietlibc
#elif defined(__GLIBC__)
LIBC=gnu
#elif defined(__LLVM_LIBC__)
LIBC=llvm
#else
#include <stdarg.h>
/* First heuristic to detect musl libc. */
@ -169,6 +174,7 @@ Linux|GNU|GNU/*)
LIBC=musl
#endif
#endif
#endif
EOF
cc_set_libc=`$CC_FOR_BUILD -E "$dummy.c" 2>/dev/null | grep '^LIBC' | sed 's, ,,g'`
eval "$cc_set_libc"
@ -459,7 +465,7 @@ case $UNAME_MACHINE:$UNAME_SYSTEM:$UNAME_RELEASE:$UNAME_VERSION in
UNAME_RELEASE=`uname -v`
;;
esac
# Japanese Language versions have a version number like `4.1.3-JL'.
# Japanese Language versions have a version number like '4.1.3-JL'.
SUN_REL=`echo "$UNAME_RELEASE" | sed -e 's/-/_/'`
GUESS=sparc-sun-sunos$SUN_REL
;;
@ -628,7 +634,8 @@ EOF
sed 's/^ //' << EOF > "$dummy.c"
#include <sys/systemcfg.h>
main()
int
main ()
{
if (!__power_pc())
exit(1);
@ -712,7 +719,8 @@ EOF
#include <stdlib.h>
#include <unistd.h>
int main ()
int
main ()
{
#if defined(_SC_KERNEL_BITS)
long bits = sysconf(_SC_KERNEL_BITS);
@ -904,7 +912,7 @@ EOF
fi
;;
*:FreeBSD:*:*)
UNAME_PROCESSOR=`/usr/bin/uname -p`
UNAME_PROCESSOR=`uname -p`
case $UNAME_PROCESSOR in
amd64)
UNAME_PROCESSOR=x86_64 ;;
@ -976,7 +984,27 @@ EOF
GUESS=$UNAME_MACHINE-unknown-minix
;;
aarch64:Linux:*:*)
GUESS=$UNAME_MACHINE-unknown-linux-$LIBC
set_cc_for_build
CPU=$UNAME_MACHINE
LIBCABI=$LIBC
if test "$CC_FOR_BUILD" != no_compiler_found; then
ABI=64
sed 's/^ //' << EOF > "$dummy.c"
#ifdef __ARM_EABI__
#ifdef __ARM_PCS_VFP
ABI=eabihf
#else
ABI=eabi
#endif
#endif
EOF
cc_set_abi=`$CC_FOR_BUILD -E "$dummy.c" 2>/dev/null | grep '^ABI' | sed 's, ,,g'`
eval "$cc_set_abi"
case $ABI in
eabi | eabihf) CPU=armv8l; LIBCABI=$LIBC$ABI ;;
esac
fi
GUESS=$CPU-unknown-linux-$LIBCABI
;;
aarch64_be:Linux:*:*)
UNAME_MACHINE=aarch64_be
@ -1042,6 +1070,15 @@ EOF
k1om:Linux:*:*)
GUESS=$UNAME_MACHINE-unknown-linux-$LIBC
;;
kvx:Linux:*:*)
GUESS=$UNAME_MACHINE-unknown-linux-$LIBC
;;
kvx:cos:*:*)
GUESS=$UNAME_MACHINE-unknown-cos
;;
kvx:mbr:*:*)
GUESS=$UNAME_MACHINE-unknown-mbr
;;
loongarch32:Linux:*:* | loongarch64:Linux:*:*)
GUESS=$UNAME_MACHINE-unknown-linux-$LIBC
;;
@ -1197,7 +1234,7 @@ EOF
GUESS=$UNAME_MACHINE-pc-sysv4.2uw$UNAME_VERSION
;;
i*86:OS/2:*:*)
# If we were able to find `uname', then EMX Unix compatibility
# If we were able to find 'uname', then EMX Unix compatibility
# is probably installed.
GUESS=$UNAME_MACHINE-pc-os2-emx
;;
@ -1338,7 +1375,7 @@ EOF
GUESS=ns32k-sni-sysv
fi
;;
PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort
PENTIUM:*:4.0*:*) # Unisys 'ClearPath HMP IX 4000' SVR4/MP effort
# says <Richard.M.Bartel@ccMail.Census.GOV>
GUESS=i586-unisys-sysv4
;;
@ -1560,6 +1597,9 @@ EOF
*:Unleashed:*:*)
GUESS=$UNAME_MACHINE-unknown-unleashed$UNAME_RELEASE
;;
*:Ironclad:*:*)
GUESS=$UNAME_MACHINE-unknown-ironclad
;;
esac
# Do we have a guess based on uname results?
@ -1583,6 +1623,7 @@ cat > "$dummy.c" <<EOF
#endif
#endif
#endif
int
main ()
{
#if defined (sony)

2
config.h.in
View file

@ -11,7 +11,7 @@
#undef NEED_PUTC_CHAR
#undef HAVE_NCURSES_TERM_H
#undef HAVE_NCURSES_TERM_H
/* Define to 1 if you have the <fcntl.h> header file. */
#undef HAVE_FCNTL_H

935
config.sub vendored
View file

File diff suppressed because it is too large Load diff

40
configure.ac
View file

@ -12,13 +12,13 @@ dnl On SunOS4 systems you have to use the /usr/5bin/cc compiler
dnl to get the SYSV curses library:
case "$host_os" in
sunos4*)
AC_MSG_RESULT("using /usr/5bin/cc")
CC="/usr/5bin/cc"
ac_objext="o"
;;
AC_MSG_RESULT("using /usr/5bin/cc")
CC="/usr/5bin/cc"
ac_objext="o"
;;
*)
AC_PROG_CC
;;
AC_PROG_CC
;;
esac
@ -26,11 +26,11 @@ dnl Some curses specials
dnl Solaris needs for tputs 'putc(char)' instead of 'putc(int)'
case "$host_os" in
solaris*)
CPPFLAGS="${CPPFLAGS} -D_MSE_INT_H"
AC_DEFINE(NEED_PUTC_CHAR)
;;
CPPFLAGS="${CPPFLAGS} -D_MSE_INT_H"
AC_DEFINE(NEED_PUTC_CHAR)
;;
hpux9*) DEFS=${DEFS-"-DMINICURSES"}
;;
;;
esac
@ -65,21 +65,21 @@ AC_ARG_WITH(ncurses,
AC_CHECK_HEADER([ncurses.h],[
AC_SEARCH_LIBS([initscr], [ncurses], [
AC_DEFINE(HAVE_NCURSES_H)
AC_SEARCH_LIBS([tputs], [tinfo])],[
AC_SEARCH_LIBS([tputs], [tinfo])],[
AC_SEARCH_LIBS([initscr], [curses],[
AC_DEFINE(HAVE_CURSES_H)
AC_SEARCH_LIBS([tputs], [tinfo])],[
AC_MSG_ERROR([bvi requires a curses library])])])
],[
AC_MSG_ERROR([bvi requires a curses library])])])
],[
AC_CHECK_HEADER([curses.h],[
AC_SEARCH_LIBS([initscr], [curses], [
AC_DEFINE(HAVE_CURSES_H)],[
AC_MSG_ERROR([bvi requires a curses library])])],[
AC_SEARCH_LIBS([initscr], [curses], [
AC_DEFINE(HAVE_CURSES_H)],[
AC_MSG_ERROR([bvi requires a curses library])])],[
AC_CHECK_HEADER([ncursesw/curses.h], [
AC_SEARCH_LIBS([initscr], [ncursesw], [
AC_DEFINE(HAVE_NCURSESW_CURSES_H)],[
AC_MSG_ERROR([bvi requires a curses library])])],[
AC_MSG_ERROR([bvi requires a curses library])])])])
AC_SEARCH_LIBS([initscr], [ncursesw], [
AC_DEFINE(HAVE_NCURSESW_CURSES_H)],[
AC_MSG_ERROR([bvi requires a curses library])])],[
AC_MSG_ERROR([bvi requires a curses library])])])])
dnl Checks for typedefs, structures, and compiler characteristics.
dnl AC_TYPE_SIZE_T

66
dosio.c
View file

@ -141,14 +141,14 @@ save(char *fname, PTR start, PTR end, int flags)
if (!fname) {
emsg("No file|No current filename");
return 0;
}
}
if (stat(fname, &buf) == -1) {
newstr = "[New file] ";
} else {
if (S_ISDIR(buf.st_mode)) {
sprintf(string, "\"%s\" Is a directory", fname);
msg(string);
return 0;
} else {
if (S_ISDIR(buf.st_mode)) {
sprintf(string, "\"%s\" Is a directory", fname);
msg(string);
return 0;
}
newstr = "";
}
@ -159,20 +159,20 @@ save(char *fname, PTR start, PTR end, int flags)
return 0;
}
if (filemode == PARTIAL) {
if (block_read) {
filesize = block_read;
sprintf(string, "\"%s\" range %lu-%lu", fname,
(unsigned long)block_begin,
(unsigned long)(block_begin - 1 + filesize));
if (lseek(fd, block_begin, SEEK_SET) < 0) {
sysemsg(fname);
return 0;
}
} else {
msg("Null range");
return 0;
}
} else {
if (block_read) {
filesize = block_read;
sprintf(string, "\"%s\" range %lu-%lu", fname,
(unsigned long)block_begin,
(unsigned long)(block_begin - 1 + filesize));
if (lseek(fd, block_begin, SEEK_SET) < 0) {
sysemsg(fname);
return 0;
}
} else {
msg("Null range");
return 0;
}
} else {
filesize = end - start + 1L;
sprintf(string, "\"%s\" %s%lu@bytes", fname, newstr, (long)filesize);
}
@ -228,7 +228,7 @@ load(char *fname)
} else if (filemode == REGULAR) {
memsize = buf.st_size + 100;
} else {
memsize = 1000;
memsize = 1000;
}
if (farcoreleft() < memsize) {
@ -255,18 +255,18 @@ load(char *fname)
filesize += (off_t)n;
} while (filesize < buf.st_size);
if ((filesize == 0) {
sprintf(string, "\"%s\" No such range: %lu-%lu", fname,
(unsigned long)block_begin, (unsigned long)(block_end));
} else {
sprintf(string, "\"%s\" range %lu-%lu", fname,
(unsigned long)block_begin,
(unsigned long)(block_begin + filesize - 1));
}
filemode = PARTIAL;
block_read = filesize;
msg(string);
P(P_OF) = block_begin;
params[P_OF].flags |= P_CHANGED;
sprintf(string, "\"%s\" No such range: %lu-%lu", fname,
(unsigned long)block_begin, (unsigned long)(block_end));
} else {
sprintf(string, "\"%s\" range %lu-%lu", fname,
(unsigned long)block_begin,
(unsigned long)(block_begin + filesize - 1));
}
filemode = PARTIAL;
block_read = filesize;
msg(string);
P(P_OF) = block_begin;
params[P_OF].flags |= P_CHANGED;
}
} else if (filemode == REGULAR) {
chunk = buf.st_size > 0xfffe ? 0xfffe : buf.st_size;

177
edit.c
View file

@ -12,8 +12,9 @@
* 2006-04-05 V 1.3.3 alpha - binary representation
* 2014-09-30 V 1.4.0
* 2019-10-12 V 1.4.1
* 2025-07-19 V 1.5.0
*
* Copyright 1996-2019 by Gerhard Buergmann
* Copyright 1996-2025 by Gerhard Buergmann
* gerhard@puon.at
*
* This program is free software; you can redistribute it and/or modify it
@ -63,8 +64,7 @@ static char *getcnext = NULL;
* characters (for "." command)
*/
off_t
edit(mode)
int mode;
edit(int mode)
{
int ch, ch1;
size_t len;
@ -117,7 +117,7 @@ edit(mode)
setcur();
continue;
}
if (ch == KEY_BACKSPACE
if (ch == KEY_BACKSPACE
|| ch == ASCII_DEL
|| ch == BVICTRL('H')) {
if (count > 0) {
@ -286,8 +286,7 @@ escape:
* else setpage()
*/
PTR
do_ft(ch, flag)
int ch, flag;
do_ft(int ch, int flag)
{
static int chi;
static int chp = 1;
@ -298,7 +297,7 @@ do_ft(ch, flag)
switch (ch) {
/*
case 1: beep();
return NULL; no previous command
return NULL; no previous command
case -1: if (chp == 'f' || chp == 't') dir = BACKWARD;
else dir = FORWARD;
break;
@ -364,8 +363,7 @@ do_ft(ch, flag)
void
do_z(mode)
int mode;
do_z(int mode)
{
switch (mode) {
case '.': while (y != maxy / 2) {
@ -401,8 +399,7 @@ do_z(mode)
void
scrolldown(lns)
int lns;
scrolldown(int lns)
{
while (lns--) {
if (maxpos >= (pagepos + Anzahl)) pagepos += Anzahl;
@ -414,8 +411,7 @@ scrolldown(lns)
void
scrollup(lns)
int lns;
scrollup(int lns)
{
while (lns--) {
if (mem <= (PTR)(pagepos - Anzahl)) pagepos -= Anzahl;
@ -459,13 +455,14 @@ setcur()
void
statpos()
{
char bin_val [9];
char bin_val [9];
unsigned char Char1;
int i;
int i;
off_t bytepos;
char string[MAXCMD+1], str[6];
if (!P(P_MO)) return;
// if (!P(P_MO)) return;
if (!statusflag) return;
bytepos = current - mem;
if (bytepos >= filesize) {
// mvaddstr(maxy, status, " ");
@ -483,11 +480,19 @@ statpos()
}
}
bin_val[8] = '\0';
sprintf(string, "%08llX %s \\%03o 0x%02X %3d ",
(long long)(bytepos + P(P_OF)), bin_val, Char1, Char1, Char1);
attrset(A_BOLD);
status = maxx - 1 - statsize;
if (status > 0) {
sprintf(string, "%08llX %s \\%03o 0x%02X %3d ",
(long long)(bytepos + P(P_OF)), bin_val, Char1, Char1, Char1);
} else {
sprintf(string, "%08llX %3d ",
(long long)(bytepos + P(P_OF)), Char1);
mvaddstr(maxy, 0, string);
attrset(A_NORMAL);
return;
}
mvaddstr(maxy, status, string);
if (isprint(Char1)) {
@ -521,10 +526,9 @@ statpos()
}
void
printline(mempos, scpos)
PTR mempos;
int scpos;
printline(PTR mempos, int scpos)
{
PTR hl_start = 0;
PTR hl_end = 0;
@ -544,44 +548,44 @@ printline(mempos, scpos)
mv_pos = AnzAdd;
*linbuf = '\0';
if (hl_spat) {
f_start = (mempos - Anzahl) < mem ? mem : (mempos - Anzahl);
f_end = mempos + (2 * Anzahl);
hl_start = fsearch_end(f_start, f_end, search_pat, &hl_end);
f_start = (mempos - Anzahl) < mem ? mem : (mempos - Anzahl);
f_end = mempos + (2 * Anzahl);
hl_start = fsearch_end(f_start, f_end, search_pat, &hl_end);
}
for (print_pos = 0; print_pos < Anzahl; print_pos++) {
if (hl_spat) {
while (hl_start != NULL) {
if (hl_start < mempos) {
if (hl_end < mempos) {
f_start = hl_start + 1;
hl_start = fsearch_end(f_start, f_end, search_pat, &hl_end);
} else {
attrset(A_STANDOUT); /* start out highlighted */
break;
}
} else if (hl_start >= mempos) {
break;
}
}
if (hl_start != NULL) {
if ((hl_start - mempos) == print_pos) {
mvaddstr(scpos, mv_pos, linbuf);
mv_pos = AnzAdd + (3 * print_pos);
*linbuf = '\0';
attrset(A_STANDOUT);
}
if ((hl_end - mempos) == print_pos) {
mvaddstr(scpos, mv_pos, linbuf);
*linbuf = '\0';
mv_pos = AnzAdd + (3 * print_pos);
f_start = hl_end;
hl_start = fsearch_end(f_start, f_end, search_pat, &hl_end);
if (f_start != hl_start) {
attrset(A_NORMAL);
}
}
}
while (hl_start != NULL) {
if (hl_start < mempos) {
if (hl_end < mempos) {
f_start = hl_start + 1;
hl_start = fsearch_end(f_start, f_end, search_pat, &hl_end);
} else {
attrset(A_STANDOUT); /* start out highlighted */
break;
}
} else if (hl_start >= mempos) {
break;
}
}
if (hl_start != NULL) {
if ((hl_start - mempos) == print_pos) {
mvaddstr(scpos, mv_pos, linbuf);
mv_pos = AnzAdd + (3 * print_pos);
*linbuf = '\0';
attrset(A_STANDOUT);
}
if ((hl_end - mempos) == print_pos) {
mvaddstr(scpos, mv_pos, linbuf);
*linbuf = '\0';
mv_pos = AnzAdd + (3 * print_pos);
f_start = hl_end;
hl_start = fsearch_end(f_start, f_end, search_pat, &hl_end);
if (f_start != hl_start) {
attrset(A_NORMAL);
}
}
}
}
if (mempos + print_pos >= maxpos) {
sprintf(tmpbuf, " ");
@ -609,10 +613,10 @@ printline(mempos, scpos)
addstr(string);
attrset(A_NORMAL);
} else {
addstr(".");
addstr(".");
}
} else {
addstr(".");
addstr(".");
}
}
} else {
@ -660,8 +664,7 @@ repaint() /***** redraw screen *********************/
/******* display an arbitrary address on screen *******/
void
setpage(addr)
PTR addr;
setpage(PTR addr)
{
if ((addr >= pagepos) && ((addr - pagepos) < screen)) {
y = (addr - pagepos) / Anzahl;
@ -684,8 +687,7 @@ setpage(addr)
int
cur_forw(check)
int check;
cur_forw(int check)
{
if (check) {
if (current - mem >= filesize) {
@ -760,8 +762,7 @@ cur_back()
void
fileinfo(fname)
char *fname;
fileinfo(char *fname)
{
off_t bytepos;
char fstatus[MAXCMD];
@ -788,8 +789,8 @@ fileinfo(fname)
if (edits) strcat(string, "[Modified] ");
if (filesize) {
bytepos = (pagepos + y * Anzahl + xpos()) - mem + 1L;
sprintf(fstatus, "byte %llu of %llu --%llu%%--",
(unsigned long long)bytepos,
sprintf(fstatus, "byte %llu of %llu --%llu%%--",
(unsigned long long)bytepos,
(unsigned long long)filesize,
(unsigned long long)(bytepos * 100L / filesize));
strcat(string, fstatus);
@ -830,8 +831,7 @@ vgetc()
void
stuffin(s)
char *s;
stuffin(char *s)
{
if (s == NULL) { /* clear the stuff buffer */
getcnext = NULL;
@ -846,9 +846,7 @@ char *s;
void
do_back(n, start)
off_t n;
PTR start;
do_back(off_t n, PTR start)
{
if (start - n < mem) {
beep();
@ -870,9 +868,7 @@ do_back(n, start)
int
do_delete(n, start)
off_t n;
PTR start;
do_delete(off_t n, PTR start)
{
if (n + start > maxpos) {
beep();
@ -902,10 +898,7 @@ do_delete(n, start)
* The :insert, :append and :change command
*/
void
do_ins_chg(start, arg, mode)
PTR start;
char *arg;
int mode;
do_ins_chg(PTR start, char *arg, int mode)
{
int base;
off_t buffer = BUFFER;
@ -945,22 +938,22 @@ do_ins_chg(start, arg, mode)
if (base == 1) { /* ASCII */
while (*poi != '\0') {
if (*poi == '\\') {
switch (*(++poi)) {
case 'n': val = '\n'; break;
case 'r': val = '\r'; break;
case 't': val = '\t'; break;
case '0': val = '\0'; break;
case '\\': val = '\\'; break;
default : val = '\\'; poi--;
}
poi++;
switch (*(++poi)) {
case 'n': val = '\n'; break;
case 'r': val = '\r'; break;
case 't': val = '\t'; break;
case '0': val = '\0'; break;
case '\\': val = '\\'; break;
default : val = '\\'; poi--;
}
poi++;
} else {
val = *poi++;
}
*(tempbuf + count++) = val;
}
} else {
while (isspace(cmdstr[strlen(cmdstr) - 1]))
while (isspace(cmdstr[strlen(cmdstr) - 1]))
cmdstr[strlen(cmdstr) - 1] = '\0';
while (*poi != '\0') {
val = strtol(poi, &epoi, base);
@ -993,7 +986,7 @@ do_ins_chg(start, arg, mode)
case U_APPEND:
if ((undo_count = alloc_buf(count, &undo_buf)) == 0L) {
repaint();
goto mfree;
goto mfree;
}
do_append((off_t)count, tempbuf);
memcpy(undo_buf, tempbuf, count);
@ -1021,11 +1014,9 @@ clear_marks()
void
do_mark(mark, addr)
int mark;
PTR addr;
do_mark(int mark, PTR addr)
{
if (mark < 'a' || mark > 'z' || current >= maxpos)
if (mark < 'a' || mark > 'z' || current >= maxpos)
return;
markbuf[mark - 'a'] = addr;
}

41
io.c
View file

@ -12,10 +12,11 @@
* 2014-05-03 V 1.4.0
* 2019-01-27 V 1.4.1
* 2022-03-09 V 1.4.2
* 2025-07-19 V 1.5.0
*
* NOTE: Edit this file with tabstop=4 !
*
* Copyright 1996-2022 by Gerhard Buergmann
* Copyright 1996-2025 by Gerhard Buergmann
* gerhard@puon.at
*
* This program is free software; you can redistribute it and/or modify it
@ -79,11 +80,7 @@ extern char *fname_buf;
/*********** Save the patched file ********************/
int
save(fname, start, end, flags)
char *fname;
char *start;
char *end;
int flags;
save(char *fname, char *start, char *end, int flags)
{
int fd;
char *string;
@ -167,8 +164,7 @@ save(fname, start, end, flags)
/* loads a file, returns the filesize */
off_t
load(fname)
char *fname;
load(char *fname)
{
int fd = -1;
//char *string;
@ -235,7 +231,7 @@ load(fname)
params[P_RO].flags |= P_CHANGED;
}
} else {
sysemsg(fname);
sysemsg(fname);
filemode = ERROR;
}
}
@ -333,12 +329,11 @@ load(fname)
}
/* argument "dir" not used!
/* argument "dir" not used!
* Needed for DOS version only
*/
void
bvi_init(dir)
char *dir;
bvi_init(char *dir)
{
char *initstr;
char rcpath[MAXCMD];
@ -352,7 +347,7 @@ bvi_init(dir)
docmdline(initstr);
return;
}
#ifdef DJGPP
strcpy(rcpath, "c:");
strcpy(rcpath, dir);
@ -378,8 +373,7 @@ bvi_init(dir)
int
enlarge(add)
off_t add;
enlarge(off_t add)
{
char *newmem;
off_t savecur, savepag, savemax, saveundo;
@ -428,11 +422,10 @@ do_shell()
#ifndef HAVE_STRDUP
char *
strdup(s)
char *s;
strdup(char *s)
{
char *p;
size_t n;
size_t n;
n = strlen(s) + 1;
if ((p = (char *)malloc(n)) != NULL)
@ -447,10 +440,7 @@ strdup(s)
* Copy contents of memory (with possible overlapping).
*/
char *
memmove(s1, s2, n)
char *s1;
char *s2;
size_t n;
memmove(char *s1, char *s2, size_t n)
{
bcopy(s2, s1, n);
return(s1);
@ -459,9 +449,7 @@ memmove(s1, s2, n)
off_t
alloc_buf(n, buffer)
off_t n;
char **buffer;
alloc_buf(off_t n, char **buffer)
{
if (*buffer == NULL) {
*buffer = (char *)malloc(n);
@ -477,8 +465,7 @@ alloc_buf(n, buffer)
int
addfile(fname)
char *fname;
addfile(char *fname)
{
int fd;
off_t oldsize;

84
macro.m4
View file

@ -1,59 +1,59 @@
AC_CHECK_HEADER
(
[ncurses.h],
[
[ncurses.h],
[
AC_SEARCH_LIBS
([initscr], [ncurses],
[
AC_DEFINE(HAVE_NCURSES_H)
AC_SEARCH_LIBS([tputs], [tinfo])
],[
AC_SEARCH_LIBS
(
[initscr], [curses],
[
AC_DEFINE(HAVE_NCURSES_H)
AC_SEARCH_LIBS([tputs], [tinfo])
],[
AC_SEARCH_LIBS
(
[initscr], [curses],
[
AC_DEFINE(HAVE_CURSES_H)
AC_SEARCH_LIBS([tputs], [tinfo])
AC_DEFINE(HAVE_CURSES_H)
AC_SEARCH_LIBS([tputs], [tinfo])
],[
AC_MSG_ERROR([bvi requires a curses library])
AC_MSG_ERROR([bvi requires a curses library])
]
)
]
]
)
],[
],[
AC_CHECK_HEADER
(
[curses.h],
[
AC_SEARCH_LIBS
[curses.h],
[
AC_SEARCH_LIBS
(
[initscr], [curses],
[
AC_DEFINE(HAVE_CURSES_H)
],[
AC_MSG_ERROR([bvi requires a curses library])
]
)
],[
# statt: AC_MSG_ERROR([bvi requires a curses library])
AC_CHECK_HEADER
(
[initscr], [curses],
[ncursesw/curses.h],
[
AC_DEFINE(HAVE_CURSES_H)
AC_SEARCH_LIBS
(
[initscr], [curses],
[
AC_DEFINE(HAVE_NCURSESW_CURSES_H)
],[
AC_MSG_ERROR([bvi requires a curses library])
]
)
],[
AC_MSG_ERROR([bvi requires a curses library])
AC_MSG_ERROR([bvi requires a curses library])
]
)
],[
# statt: AC_MSG_ERROR([bvi requires a curses library])
AC_CHECK_HEADER
(
[ncursesw/curses.h],
[
AC_SEARCH_LIBS
(
[initscr], [curses],
[
AC_DEFINE(HAVE_NCURSESW_CURSES_H)
],[
AC_MSG_ERROR([bvi requires a curses library])
]
)
],[
AC_MSG_ERROR([bvi requires a curses library])
]
)
]
)
]
]
)
]
)

2
patchlevel.h
View file

@ -1 +1 @@
#define VERSION "1.4.2"
#define VERSION "1.5.0"

74
re.c
View file

@ -12,8 +12,9 @@
* 2013-08-24 V 1.4.0
* 2019-01-28 V 1.4.1
* 2023-03-07 V 1.4.2
* 2025-07-19 V 1.5.0
*
* Copyright 1996-2023 by Gerhard Buergmann
* Copyright 1996-2025 by Gerhard Buergmann
* gerhard@puon.at
*
* This program is free software; you can redistribute it and/or modify it
@ -32,11 +33,15 @@
/* You cannot use a common regexp subroutine, because \0 is a regular
* character in a binary string !
*/
#include "bvi.h"
#include "set.h"
#ifdef __STDC__
static int sbracket(int, char *, int);
#else
static int sbracket();
#endif
char act_pat[MAXCMD]; /* found pattern */
char pattern[MAXCMD + 1];
@ -48,9 +53,7 @@ char *emptyclass = "Bad character class|Empty byte class '[]' or '[^]' cannot ma
PTR
bregexec(start, scan)
PTR start;
char *scan;
bregexec(PTR start, char *scan)
{
char *act;
int count, test;
@ -125,10 +128,7 @@ bregexec(start, scan)
static int
sbracket(start, scan, count)
int start;
char *scan;
int count;
sbracket(int start, char *scan, int count)
{
if (*scan++ == '^') {
if (!memchr(scan, start, --count)) return 0;
@ -140,8 +140,7 @@ sbracket(start, scan, count)
PTR
end_word(start)
PTR start;
end_word(PTR start)
{
PTR pos;
@ -155,9 +154,7 @@ end_word(start)
/* wordsearch serves the 'W' and 'w' - command
*/
PTR
wordsearch(start, mode)
PTR start;
char mode;
wordsearch(PTR start, char mode)
{
PTR found;
PTR pos;
@ -187,9 +184,7 @@ wordsearch(start, mode)
/* backsearch serves the 'b' and 'B' command
*/
PTR
backsearch(start, mode)
PTR start;
char mode;
backsearch(PTR start, char mode)
{
PTR pos;
int ccount;
@ -216,11 +211,7 @@ backsearch(start, mode)
/* used by :s
*/
int
do_substitution(delim, line, startpos, endpos)
int delim;
char *line;
PTR startpos;
PTR endpos;
do_substitution(int delim, char *line, PTR startpos, PTR endpos)
{
int n;
char *found;
@ -332,9 +323,9 @@ AGAIN:
emsg(notfound);
} else {
if (P(P_TE))
sprintf(string, "No match to %s", direct == FORWARD ? "BOTTOM" : "TOP");
sprintf(string, "No match to %s", direct == FORWARD ? "BOTTOM" : "TOP");
else
sprintf(string, "Address search hit %s without matching pattern",
sprintf(string, "Address search hit %s without matching pattern",
direct == FORWARD ? "BOTTOM" : "TOP");
emsg(string);
}
@ -376,12 +367,7 @@ SKIP:
* return address found
*/
PTR
searching(ch, line, startpos, endpos, flag)
int ch;
char *line;
PTR startpos;
PTR endpos;
int flag;
searching(int ch, char *line, PTR startpos, PTR endpos, int flag)
{
char *cmd = NULL;
PTR found;
@ -455,9 +441,9 @@ searching(ch, line, startpos, endpos, flag)
emsg(notfound);
} else {
if (P(P_TE)) {
sprintf(string, "No match to %s", sdir == FORWARD ? "BOTTOM" : "TOP");
sprintf(string, "No match to %s", sdir == FORWARD ? "BOTTOM" : "TOP");
} else {
sprintf(string, "Address search hit %s without matching pattern",
sprintf(string, "Address search hit %s without matching pattern",
sdir == FORWARD ? "BOTTOM" : "TOP");
}
emsg(string);
@ -485,9 +471,7 @@ searching(ch, line, startpos, endpos, flag)
* returns pointer to next character
*/
char *
patcpy(s1, s2, delim)
char *s1, *s2;
char delim;
patcpy(char *s1, char *s2, char delim)
{
while (*s2 != '\0' && *s2 != delim) {
if (*s2 == '\\' && *(s2 + 1) == delim) s2++;
@ -500,14 +484,10 @@ patcpy(s1, s2, delim)
PTR
fsearch_end(start, end, smem, s_end)
fsearch_end(PTR start, PTR end, char *smem, PTR *s_end)
/*
fsearch(start, end, smem)
*/
PTR start;
PTR end;
char *smem;
PTR *s_end;
{
PTR spos;
@ -526,10 +506,7 @@ fsearch(start, end, smem)
PTR
fsearch(start, end, smem)
PTR start;
PTR end;
char *smem;
fsearch(PTR start, PTR end, char *smem)
{
PTR s_end;
return fsearch_end(start, end, smem, &s_end);
@ -537,10 +514,7 @@ fsearch(start, end, smem)
PTR
rsearch(start, end, smem)
PTR start;
PTR end;
char *smem;
rsearch(PTR start, PTR end, char *smem)
{
PTR spos;
@ -560,9 +534,7 @@ rsearch(start, end, smem)
* returns NULL on error or default_address, if nothing found
*/
PTR
calc_addr(pointer, def_addr)
char **pointer;
PTR def_addr;
calc_addr(char **pointer, PTR def_addr)
{
PTR addr;
int ch, mark;

13
recomp.c
View file

@ -6,8 +6,9 @@
* 2000-04-25 V 1.3.0 beta
* 2000-07-12 V 1.3.0 final
* 2019-01-28 V 1.4.1
* 2025-07-19 V 1.5.0
*
* Copyright 1996-2019 by Gerhard Buergmann
* Copyright 1996-2025 by Gerhard Buergmann
* gerhard@puon.at
*
* This program is free software; you can redistribute it and/or modify it
@ -26,7 +27,7 @@
/* You cannot use a common regexp subroutine, because \0 is a regular
* character in a binary string !
*/
#include "bvi.h"
#include "set.h"
@ -46,9 +47,7 @@ extern char *emptyclass;
* Compiling an ASCII sequence to a regex string
*/
int
ascii_comp(smem, pattern)
char *smem;
char *pattern;
ascii_comp(char *smem, char *pattern)
{
char *end;
char *comp;
@ -167,9 +166,7 @@ ascii_comp(smem, pattern)
* Compiling a hex expression to a regex string
*/
int
hex_comp(smem, pattern)
char *smem;
char *pattern;
hex_comp(char *smem, char *pattern)
{
char *end;
char *comp;

134
set.c
View file

@ -9,13 +9,14 @@
* 1999-07-02 V 1.2.0 beta
* 1999-08-14 V 1.2.0 final
* 2000-07-15 V 1.3.0 final
* 2001-10-10 V 1.3.1
* 2001-10-10 V 1.3.1
* 2003-07-03 V 1.3.2
* 2010-06-02 V 1.2.4
* 2014-09-30 V 1.4.0
* 2019-01-22 V 1.4.1
* 2025-07-19 V 1.5.0
*
* Copyright 1996-2019 by Gerhard Buergmann
* Copyright 1996-2025 by Gerhard Buergmann
* gerhard@puon.at
*
* This program is free software; you can redistribute it and/or modify it
@ -34,46 +35,47 @@
#include "bvi.h"
#include "set.h"
static int from_file = 0;
static int from_file = 0;
static FILE *ffp;
static char fbuf[MAXCMD+1];
static char buf[MAXCMD+1];
struct param params[] = {
{ "autowrite", "aw", FALSE, "", P_BOOL },
{ "columns", "cm", 16, "", P_NUM },
{ "columns", "cm", 0, "", P_NUM },
{ "errorbells", "eb", FALSE, "", P_BOOL },
{ "ignorecase", "ic", FALSE, "", P_BOOL },
{ "magic", "ma", TRUE, "", P_BOOL },
{ "magic", "ma", TRUE, "", P_BOOL },
{ "memmove", "mm", FALSE, "", P_BOOL },
{ "offset", "of", 0, "", P_NUM },
{ "offset", "of", 0, "", P_NUM },
{ "readonly", "ro", FALSE, "", P_BOOL },
{ "scroll", "scroll", 12, "", P_NUM },
{ "scroll", "scroll", 12, "", P_NUM },
{ "showmode", "mo", TRUE, "", P_BOOL },
{ "term", "term", 0, "", P_TEXT },
{ "terse", "terse", FALSE, "", P_BOOL },
{ "term", "term", 0, "", P_TEXT },
{ "terse", "terse", FALSE, "", P_BOOL },
{ "unixstyle", "us", FALSE, "", P_BOOL },
{ "window", "window", 25, "", P_NUM },
{ "wordlength", "wl", 4, "", P_NUM },
{ "window", "window", 0, "", P_NUM },
{ "wordlength", "wl", 4, "", P_NUM },
{ "wrapscan", "ws", TRUE, "", P_BOOL },
{ "highlight", "hl", TRUE, "", P_BOOL },
{ "reverse", "re", FALSE, "", P_BOOL },
{ "highlight", "hl", TRUE, "", P_BOOL },
{ "reverse", "re", FALSE, "", P_BOOL },
#if defined(__MSDOS__) && !defined(DJGPP)
{ "color", "co", 7, "", P_NUM },
{ "color", "co", 7, "", P_NUM },
#endif
{ "", "", 0, "", 0, } /* end marker */
{ "", "", 0, "", 0, } /* end marker */
};
int
doset(arg)
char *arg; /* parameter string */
doset(char *arg)
{
int i;
int i;
char *s;
int did_window = FALSE;
int state = TRUE; /* new state of boolean parms. */
int did_window = FALSE;
int state = TRUE; /* new state of boolean parms. */
char string[80];
off_t val;
if (arg == NULL) {
showparms(FALSE);
@ -111,20 +113,38 @@ doset(arg)
return 0;
}
if (!strcmp(params[i].fullname, "term")) {
emsg("Can't change type of terminal from within bvi");
emsg("Can't change@type of terminal from within bvi");
return 1;
}
if (params[i].flags & P_NUM) {
if ((i == P_LI) || (i == P_OF)) did_window++;
if ((i == P_LI) || (i == P_OF) || (i == P_CM)) did_window++;
if (arg[strlen(s)] != '=' || state == FALSE) {
sprintf(string, "Option %s is not a toggle",
params[i].fullname);
sprintf(string, "Option %s is not a toggle", params[i].fullname);
emsg(string);
return 1;
} else {
s = arg + strlen(s) + 1;
params[i].nvalue = strtoll(s, &s, 0);
val = strtoll(s, &s, 0);
if ((i == P_CM || i == P_LI) && (!strcmp("auto", s) || (val == 0))) {
if (i == P_CM) {
params[i].nvalue = 0;
Anzahl = ((COLS - AnzAdd - space) / 4);
} else {
params[i].nvalue = 0;
maxy = LINES - 1;
}
} else {
params[i].nvalue = val;
if (i == P_CM) {
Anzahl = val;
} else {
maxy = val;
}
}
params[i].flags |= P_CHANGED;
if (i == P_LI) params[P_SS].nvalue = val / 2;
#if defined(__MSDOS__) && !defined(DJGPP)
if (i == P_CO) {
textcolor(P(P_CO) & 0x07);
@ -134,22 +154,23 @@ doset(arg)
}
#endif
if (i == P_CM) {
/*
if (((COLS - AnzAdd - 1) / 4) >= P(P_CM)) {
Anzahl = P(P_CM);
} else {
Anzahl = P(P_CM) = ((COLS - AnzAdd - 1) / 4);
Anzahl = ((COLS - AnzAdd - 1) / 4);
}
maxx = Anzahl * 4 + AnzAdd + 1;
Anzahl3 = Anzahl * 3;
status = Anzahl3 + Anzahl - 17;
screen = Anzahl * (maxy - 1);
did_window++;
*/
maxx = Anzahl * 4 + AnzAdd + 1;
Anzahl3 = Anzahl * 3;
status = Anzahl3 + Anzahl - statsize;
screen = Anzahl * (maxy - 1);
stuffin("H"); /* set cursor at HOME */
}
}
} else { /* boolean */
if (arg[strlen(s)] == '=') {
emsg("Invalid set of boolean parameter");
emsg("Invalid set@of boolean parameter");
return 1;
} else {
params[i].nvalue = state;
@ -169,7 +190,10 @@ doset(arg)
}
if (did_window) {
/*
maxy = P(P_LI) - 1;
maxy = LINES - 1;
*/
new_screen();
}
@ -179,28 +203,33 @@ doset(arg)
/* show ALL parameters */
void
showparms(all)
int all;
showparms(int all)
{
struct param *p;
int n;
int n, i;
statusflag = 0;
n = 2;
i = -1;
msg("Parameters:\n");
for (p = &params[0]; p->fullname[0] != '\0' ;p++) {
i++;
if (!all && ((p->flags & P_CHANGED) == 0))
continue;
if (p->flags & P_BOOL)
sprintf(buf, " %s%s\n",
(p->nvalue ? " " : "no"), p->fullname);
else if (p->flags & P_TEXT)
if (p->flags & P_BOOL) {
sprintf(buf, " %s%s\n", (p->nvalue ? " " : "no"), p->fullname);
} else if (p->flags & P_TEXT) {
sprintf(buf, " %s=%s\n", p->fullname, p->svalue);
else
sprintf(buf, " %s=%lld\n", p->fullname, (long long)p->nvalue);
} else {
if ((p->nvalue == 0) && (i == P_CM || i == P_LI)) {
sprintf(buf, " %s=auto\n", p->fullname);
} else {
sprintf(buf, " %s=%lld\n", p->fullname, (long long)p->nvalue);
}
}
msg(buf);
n++;
if (n == params[P_LI].nvalue) {
if (n == maxy) {
if (wait_return(FALSE)) return;
n = 1;
}
@ -211,8 +240,7 @@ showparms(all)
/* reads the init file (.bvirc) */
int
read_rc(fn)
char *fn;
read_rc(char *fn)
{
int i;
@ -230,9 +258,7 @@ read_rc(fn)
int
do_logic(mode, str)
int mode;
char *str;
do_logic(int mode, char *str)
{
int a, b;
int value;
@ -289,13 +315,13 @@ do_logic(mode, str)
b = a >> 8;
a |= b;
break;
case RROTATE:
case RROTATE:
b = a << 8;
a |= b;
a >>= value;
a >>= value;
/*
b = a << (8 - value);
a >>= value;
a >>= value;
a |= b;
*/
break;
@ -303,7 +329,7 @@ do_logic(mode, str)
break;
case OR: a |= value;
break;
case XOR:
case XOR:
case NOT: a ^= value;
break;
case NEG: a ^= value;
@ -318,9 +344,7 @@ do_logic(mode, str)
int
getcmdstr(p, x)
char *p;
int x;
getcmdstr(char *p, int x)
{
int c;
int i, n;

7
set.h
View file

@ -2,8 +2,8 @@
*
* NOTE: Edit this file with tabstop=4 !
*
* Copyright 1996-2019 by Gerhard Buergmann
* Gerhard.Buergmann@puon.at
* Copyright 1996-2025 by Gerhard Buergmann
* gerhard@puon.at
*
* 1998-03-14 V 1.0.0
* 1999-01-14 V 1.1.0
@ -14,6 +14,7 @@
* 2010-06-02 V 1.3.4
* 2013-08-23 V 1.4.0
* 2019-01-22 V 1.4.1
* 2025-05-24 V 1.5.0
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
@ -34,7 +35,7 @@ struct param {
char *shortname; /* permissible abbreviation */
off_t nvalue;
char *svalue;
int flags;
int flags;
};
extern struct param params[];

1091
tags
View file

File diff suppressed because it is too large Load diff