Commit Graph

223 Commits

Author SHA1 Message Date
aymeric 36f363a1cc bump to nb9 after fixing PR#21797.
"flooding nvi['s insert mode] leads it to dump core"
2003-06-06 08:09:38 +00:00
aymeric baffc152bc When an error occurs in v_txt(), leave input mode too.
Otherwise, (among other things) db_get() thinks it can re-use the TEXT buffers
when it's not true, leading to a crash because that TEXT buffer will be
released just before it is actually used to create a new one.
This fixes PR#21797.
2003-06-06 08:06:47 +00:00
christos b2ee3e403d improve on previous. only adjust the length when it exceed the string length. 2003-04-18 18:46:26 +00:00
christos c0b1f367f4 Recovery of vi files has been broken for a long while. This patch is a
stopgap measure to make vi recovery mostly functional on non-binary files.
The problem is that the db holding the recovery file can become corrupted,
in which case the data size of the line becomes huge. We use heuristics to
correct the size when we load a db in recovery mode. We could use a slightly
better heuristic (looking for ascii chars before correcting the length),
but it is not worth it. Another way would have been to trap the SEGV and
access data[len] and see if that worked, but that seemed exceedingly ugly.
2003-04-18 18:33:41 +00:00
perry 1f4ad37fe3 "Utilize" has exactly the same meaning as "use," but it is more
difficult to read and understand. Most manuals of English style
therefore say that you should use "use".
2003-02-05 00:02:24 +00:00
aymeric c11faf9eec bump version.
":cs add" works when using a database file in the current directory, whichever
way we specify its name.
2003-01-20 16:13:26 +00:00
aymeric 5ca712061a . Don't call terminate() after read_prompt() failed.
Fixes memory re-use after free().
. Fake a directory name of "." if given a path without '/'.
	This makes ":cs add cscope.out" work, and behave like ":cs add ."
2003-01-20 16:10:51 +00:00
wiz 1035faff1d writable, not writeable. 2003-01-06 20:30:28 +00:00
thorpej 7b3d93e318 Avoid a strict alias warning. 2002-12-06 03:24:42 +00:00
lukem 5d4973fe97 makefile delint. use NETBSDSRCDIR as appropriate 2002-09-18 14:00:33 +00:00
pooka b09706dced add ${MACROS} to roff call to make output paper readable 2002-08-13 20:07:31 +00:00
enami b18af5ab05 Don't install nbcat instead of catalog files. Problem noticed by Kimio Ishii. 2002-06-18 00:08:00 +00:00
simonb 767793d996 Use an "int" instead of an "u_char" for a variable that is as a loop
control variable that is checked against against "<= 255".
2002-05-09 02:36:57 +00:00
fredb 01a5ccb4aa Document a couple of missing "set" options, mostly borrowing language
from vi.ref, and explain how to set "escapetime" to work-around the problem
described in PR 8277. This should close PR 8277.
2002-05-02 14:20:01 +00:00
pooka eaf1f18146 Bump to nb7 after fixing FreeBSD PR #12801 (again) in a way which hopefully
doesn't have adverse side-effects.
2002-04-15 08:37:04 +00:00
pooka a68282c497 Fix FreeBSD PR #12801 in such a way that it doesn't create unfortunate
side-effects, like the ones described in bin/15891 and bin/16210.

patch from Sven Verdoolaege (nvi maintainer)
2002-04-15 08:31:42 +00:00
thorpej 7f192498d4 Use __RCSID() and __COPYRIGHT(). 2002-04-09 01:47:30 +00:00
simonb c9f9583821 Back out rev 1.6, per discussion with Aymeric Vincent and Antti Kantee.
Rev 1.6 fixes an obscure core-dump problem, but changes the long time
behaviour of cursor positioning when switching files.

"Fixes" PR bin/15891.
2002-03-25 00:13:56 +00:00
pooka 69d4c677a2 bump version to nb6 after fixing bin/15474 2002-02-11 19:52:00 +00:00
pooka bbd559bc7a Exit the file_init "recursion" only if we are actually already trying for
a second time. Checking for the plain temp filename was not enough,
as it may be set even though we are calling the function for the
first time.

fixes bin/15474 by Chuck Cranor
2002-02-09 19:33:53 +00:00
ross 2a76afae02 Generate <>& symbolically. I'm avoiding .../dist/... directories for now. 2002-02-08 01:36:18 +00:00
aymeric 87c2d396bf Fixed FreeBSD PR #12801, the way nvi 1.81.5 did it.
(vi dumped core when editing a new file after having edited another one)
affects common/exf.c
2002-01-13 11:59:23 +00:00
aymeric 9000224da7 Fix FreeBSD PR #12801, the way nvi 1.81.5 does it.
(vi dumped core when editing a new file after having edited another one)
2002-01-13 11:57:38 +00:00
aymeric 313d2d2f8c cast size_t to u_long for printf(3)-like calls
This only affects #ifdef DEBUG code.
2002-01-07 19:22:16 +00:00
thorpej 3d561f4807 Avoid an "operation on foo may be undefined" warning (gcc 3.1). 2001-12-31 18:53:32 +00:00
aymeric 8547d02861 FreeBSD PR#23912 fixed by applying a patch from nvi 1.81.x
"underflow of cnt in vs_paint() by O_NUMBER_LENGTH when both leftright and
 number options in use"
2001-12-13 20:53:47 +00:00
aymeric b9d2b65ffd Finally apply a fix from nvi 1.81.x to replace a fix committed by
Simon Burge which came from the Debian project.
This is still not TRT, but it's correct, and it gets us closer to future
versions of nvi.
I'll do ART (A Right Thing) when I have time... That's why I'm committing
this now. :-/
This fixes FreeBSD PR#23912
2001-12-13 20:51:36 +00:00
tv 8e6f7afb5b MKfoo=no -> NOfoo 2001-12-12 01:48:43 +00:00
blymn 76a99ffa0a Our libcurses now has the newterm function, make vi use it. 2001-12-02 09:05:53 +00:00
wiz aded0d2cce Whitespace cleanup. 2001-12-01 16:43:07 +00:00
simonb 9935fdfff2 Back out previous; Aymeric Vincent is looking into a better fix. 2001-10-21 22:24:25 +00:00
simonb e5b75269ea Fix problem with long pauses displaying blank lines if O_LEFTRIGHT and
O_NUMBER both are active.  Patch from Debian bug report #79768.
2001-10-21 16:04:29 +00:00
yamt 1856278572 backout my miscommit.
pointed by Aymeric Vincent.
2001-10-20 22:30:31 +00:00
aymeric 41fdc533eb bump version after fixing a bug introduced in 1.79nb2 2001-10-20 10:11:41 +00:00
aymeric be5a16fc47 Fix a cut_line() caller not using the right value for (former) ENTIRE_LINE,
by defining the (newer) CUT_LINE_TO_EOL define in common/cut.h and using it
where due.

Bug reported on current-users by Masanori Kanaoka <kanaoka@ann.hi-ho.ne.jp>
diagnosed by Bang Jun-Young <bjy@mogua.org>,
quick-fixed by Robert Elz <kre@munnari.OZ.AU>.
2001-10-20 10:04:49 +00:00
yamt f8835551fd fix format string bugs.
pointed by Tomoaki IMAMURA in PR/14271.
2001-10-17 07:38:48 +00:00
aymeric 4fa1ec90e5 bump to nb2 after fixing PR #10367 and correcting another related bug 2001-09-09 11:04:23 +00:00
aymeric 7ac97260c6 Fix a test condition for EOF. Together with previous commit in cut.c (1.4),
this fixes correctly PR #10367.
2001-09-09 11:03:02 +00:00
aymeric b88939bbba Define ENTIRE_LINE to be -1 instead of 0 since we may want to copy 0 characters.
(and use ENTIRE_LINE instead of 0 where appropriate)

This fixes a bug in the dw command with for example:

<cursor>
a b c

~
~
if you hit dw there, only the empty line would be killed but both the empty
line and the subsequent one would be pasted when asked for with P for example.
2001-09-09 11:01:09 +00:00
aymeric 8ac7d728a3 Change nvi version from 1.79 to 1.79nb1
This added version number will help us for future bug reports
2001-08-28 07:36:42 +00:00
aymeric 9092b7b124 Fix a bug present in nvi 1.79 where ^@ wouldn't behave as expected when
reading an ex command from vi.

Fixes PR#13205
2001-08-20 21:44:57 +00:00
wiz 1e378c4c12 precede, not preceed. 2001-08-20 12:00:46 +00:00
aymeric ca334636ac Prevent nvi from looping infinitely when it can't create a temporary file
because of a weird umask for example.
Make it exit instead.
This differs from the OpenBSD behaviour and is believed to be more correct.

Reported by Thomas Klausner in private e-mail, followed by a small discussion in
tech-userlevel a while ago.
2001-08-17 21:33:46 +00:00
wiz e79bfdd1cf command with two ms looks better. 2001-07-26 22:49:56 +00:00
kleink 5bec0209d9 Don't descend into catalog with MKSHARE=no. 2001-05-29 21:25:23 +00:00
aymeric edd9c529d0 Do the right thing when displaying an empty screen line when the corresponding
file line is not empty itself.

This fixes PR 4113 by Luke Mewburn.
2001-05-13 17:07:31 +00:00
aymeric 213eba5e28 Make a TRACE statement work. (mustn't have been turned on for a while! ;-)
Swap xp and yp in the arg types declaration section of vs_line() to match
prototype.
2001-05-13 16:59:58 +00:00
aymeric 48c52c6884 ERR -> SYSERR when recdir does not exist.
This results in a more useful message for the user.
2001-05-13 12:03:00 +00:00
simonb 7b6081672a If a function takes two string arguments and a printf-type printing
function uses both those arguments, then why don't we use two "%s"s
in the printf-style format string too?
2001-05-04 14:45:08 +00:00
windsor 28090d7359 recent addition of -Wall to Makefile broke the build on some arch
remove warnings on /sparc (through typecasting)
2001-05-02 21:15:19 +00:00
aymeric 7141c87f89 enable most warnings (but -Wparentheses) 2001-05-01 16:48:43 +00:00
aymeric 52117b75a3 shutup most (non-intrusive) gcc warnings 2001-05-01 16:46:11 +00:00
aymeric c064cd03c3 Now, ^C behaves just like <ESC> (but for the ``Interrupt'' message).
It is consistent with what Solaris' vi and vim do.
This addresses PR #11544 by pooka.
2001-04-30 21:34:12 +00:00
aymeric dde94d05ee recurse into recover on make install 2001-04-11 21:01:44 +00:00
aymeric 74adae64cc be quiet 2001-04-11 21:00:21 +00:00
aymeric a8c2195ffe new file. Installs virecover into /usr/libexec 2001-04-11 21:00:20 +00:00
aymeric 007a350263 move recover.script to virecover 2001-04-11 20:24:17 +00:00
itojun d865d95add the build target is "realall" not "all". it will make "make dependall" happier. 2001-03-31 14:11:12 +00:00
itojun 20383a34e1 correct catalog generation, to cope with objdir right. 2001-03-31 13:58:56 +00:00
itojun 4bca1d701f catalogs are installed by ../catalog/Makefile. 2001-03-31 13:48:31 +00:00
aymeric 36abaeee9b do install the catalogs 2001-03-31 12:13:34 +00:00
aymeric f5e91454a2 we generate catalogs properly and don't need them here 2001-03-31 11:58:43 +00:00
aymeric 5c5a144ecd remove obsolete files after import of nvi 1.79 2001-03-31 11:52:31 +00:00
aymeric 414f14c52d merge changes after import of nvi 1.79 2001-03-31 11:37:44 +00:00
aymeric fbbf6b5ed8 import of nvi 1.79 2001-03-31 11:29:43 +00:00
simonb 750247d6a3 Pull in a patch from nvi 1.79 for when the repainting code messes up.
Fixes those annoying "Error: move: l(4294967295) c(0) o(0)" core dumps.
2001-03-21 03:19:35 +00:00
lukem 5e5d0ac822 remove local version of sys/queue.h; it doesn't have some of the newer
macros (SLIST_* for example), and this breaks compilation of vi when
system header files use these newer macros
2001-03-19 20:49:20 +00:00
thorpej 7d60447ce7 Undo rev. 1.2 -- not like it'll do much good -- seems like there is
no code that checks HAVE_MMAP!
2001-01-29 00:24:24 +00:00
itojun 64a16b4f7e ru_SU locales are deprecated, ru_RU is now correct one.
rename LC_CTYPE locale declarations and vi message catalog.

From: Oleg Polyanski <luke@jetinf.com>
2001-01-22 17:48:15 +00:00
aymeric 0ec35fe298 Don't dump core when a ``bad address'' error occurs and there is neither
a file nor a command underlying it.
This fixes PR #11543.
2001-01-14 02:22:29 +00:00
lukem c2b84904ae use %ll_ instead of the less standard %q_ 2001-01-04 23:05:54 +00:00
aymeric 7d37aa5213 tagp[rev] -> tagpr[ev]
(tagp abbreviates tagpop)
2000-12-01 09:52:33 +00:00
christos 96205496e0 define HAVE_CURSES_NEWTERM for __linux__ 2000-11-05 20:07:23 +00:00
tv 17b67bd091 Fix %l[du] formats that have int arguments on ILP32; might break LP64. 2000-10-18 01:42:05 +00:00
thorpej ec185ae25b Fix a format string goof. 2000-10-11 19:28:43 +00:00
is 135600f947 More format string cleanup by sommerfeld. 2000-10-11 14:46:00 +00:00
aymeric a803656ec6 Correct behavior of options octal, print and noprint
This fixes PR #6800
2000-06-19 20:09:37 +00:00
jdc 4a3a422fde Handle xterm's alternate screen when entering or leaving ex mode, e.g.
":!ls", so that the screen is not changed before the "Press any key"
message.  Taken from v1.79.
2000-05-31 19:49:23 +00:00
matt dcdb0fd9c8 size_t != int on alpha. 2000-05-31 05:08:55 +00:00
blymn ca6d43bec7 Change vi to use new termcap interface, prevents buffer overflow in
termcap handling.
2000-05-30 11:50:47 +00:00
jdc 53a2fa3d50 We no longer meet nvi's interpretation of 'HAVE_BSD_CURSES', so comment this. 2000-05-25 06:47:53 +00:00
christos aab07b7582 Don't depend on BSD regexec extensions (REG_STARTEND)
Emulate it if it is not defined.
2000-03-17 02:23:17 +00:00
christos 32d43c9cf0 Make this work on SVR4 systems. 2000-03-17 02:22:27 +00:00
soren 89c5a767f8 Fix doubled 'the's. 2000-03-13 22:55:05 +00:00
chopps 13232a2f19 Don't restore the tag file name's trailing '/' until after the length
is taken.  This fixes relative paths in tags files.
1999-11-22 05:53:58 +00:00
lukem 88d3d7c59e update after change to return value of tputs() third argument 1999-10-04 23:26:59 +00:00
dean 448aa67f43 Fix for PR 5108 - vi gets SEGV after SIGHUP. 1999-07-08 06:09:04 +00:00
drochner a9f5848448 our curses has some more functions now 1999-04-17 17:48:23 +00:00
abs a9088d9da4 Warn if TERM environment variable not set (but still continue as normal) 1999-02-19 21:25:02 +00:00
hubertf 56f2d188fc RCS ID police 1999-02-15 04:54:34 +00:00
lukem dcab0210a0 convert from NOxxx= to MKxxx=no.
include <bsd.own.mk> if testing a MKxxx variable.
1999-02-13 02:54:17 +00:00
abs 27134b4a8f Add Gtags support from shigio@wafu.netgate.net (PR 5978). Gtags are produced
by global (http://wafu.netgate.net/tama/unix/global.html)
1999-01-08 06:16:54 +00:00
lukem 9dee5d2b46 don't install in /usr/share if NOSHARE is defined 1998-09-27 17:22:03 +00:00
mycroft af26acbc65 const poisoning. 1998-07-26 23:14:40 +00:00
mrg 32f519716b - use an array MAXHOSTNAMELEN+1 size to hold hostnames
- ensure hostname from gethostname() is nul-terminated in all cases
- minor KNF
- use MAXHOSTNAMELEN over various other values/defines
- be safe will buffers that hold hostnames
1998-07-06 06:56:06 +00:00
jtc 9a0063c6d6 Simply include -lcurses instead of -lcurses -ltermcap 1998-02-18 22:47:41 +00:00
perry c9eb40b69e Commit a fix to the problem that nvi was reporting a completely silly
error message when TERM is not set. This might or might not be a
reasonable permanent fix -- I'm waiting to hear back from Keith Bostic.

Problem was reported in pr-3816 by Erik Fair.
1998-01-10 23:04:11 +00:00
perry 3fe138c146 RCS Id Police. 1998-01-09 08:03:16 +00:00
lukem 3e8e744696 getopt returns -1 not EOF 1997-11-01 06:49:14 +00:00
lukem 8ba07ab0b3 use CPPFLAGS instead of CFLAGS 1997-10-24 09:00:17 +00:00