aboutsummaryrefslogtreecommitdiff
path: root/contrib/nvi
Commit message (Collapse)AuthorAgeFilesLines
* nvi: import version 2.2.2Baptiste Daroussin2026-01-1425-135/+739
|\
* | nvi: import version 2.2.1-52c07e8Baptiste Daroussin2025-01-026-30/+43
|\|
* | nvi: Replace Clang-only __builtin_is_aligned with C code (#124)Zhihao Yuan2024-11-272-1/+13
| | | | | | | | | | | | We should use alignof in the future. Obtained from: https://github.com/lichray/nvi2/commit/25c4d7db4ea638a31ac458b733a3b67b0a0ff634
* | nvi: use memmove to realign buffersBrooks Davis2024-11-271-17/+5
| | | | | | | | | | | | | | | | | | Replace a rather convoluted realignment algorithm with memmove(). In addition to being hard to understand, the code would read beyond the end of the input buffer in certain conditions (found on CheriBSD). Sponsored by: DARPA Pull Request: https://github.com/lichray/nvi2/pull/122
* | nvi: import version 2.2.1Baptiste Daroussin2023-09-2714-20/+212
|\|
* | Allow building usr.bin/vi with MK_ASANAlex Richardson2021-07-191-0/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We have to namespace the regex functions to avoid duplicate symbol errors. This also ensures that vi doesn't define the libc reg* functions with mismatched signatures. ld: error: duplicate symbol: regcomp >>> defined at sanitizer_common_interceptors.inc:7519 (/usr/src/contrib/llvm-project/compiler-rt/lib/sanitizer_common/sanitizer_common_interceptors.inc:7519) >>> asan_interceptors.o:(__interceptor_regcomp) in archive /usr/lib/clang/10.0.1/lib/freebsd/libclang_rt.asan-x86_64.a >>> defined at regcomp.c >>> .../regex/regcomp.c.o:(.text+0x0) ld: error: duplicate symbol: regerror >>> defined at sanitizer_common_interceptors.inc:7543 (/usr/src/contrib/llvm-project/compiler-rt/lib/sanitizer_common/sanitizer_common_interceptors.inc:7543) >>> asan_interceptors.o:(__interceptor_regerror) in archive /usr/lib/clang/10.0.1/lib/freebsd/libclang_rt.asan-x86_64.a >>> defined at regerror.c >>> .../regex/regerror.c.o:(.text+0x0) ld: error: duplicate symbol: regexec >>> defined at sanitizer_common_interceptors.inc:7530 (/usr/src/contrib/llvm-project/compiler-rt/lib/sanitizer_common/sanitizer_common_interceptors.inc:7530) >>> asan_interceptors.o:(__interceptor_regexec) in archive /usr/lib/clang/10.0.1/lib/freebsd/libclang_rt.asan-x86_64.a >>> defined at regexec.c >>> .../regex/regexec.c.o:(.text+0x0) ld: error: duplicate symbol: regfree >>> defined at sanitizer_common_interceptors.inc:7553 (/usr/src/contrib/llvm-project/compiler-rt/lib/sanitizer_common/sanitizer_common_interceptors.inc:7553) >>> asan_interceptors.o:(__interceptor_regfree) in archive /usr/lib/clang/10.0.1/lib/freebsd/libclang_rt.asan-x86_64.a >>> defined at regfree.c >>> .../regex/regfree.c.o:(.text+0x0) Committed upstream as https://github.com/lichray/nvi2/pull/92 Reviewed By: bapt Differential Revision: https://reviews.freebsd.org/D31050
* | import nvi 2.2.0-3bbdfe4Baptiste Daroussin2021-05-2122-630/+149
|\|
* | nvi: fix catalog generationdankm2021-02-261-6/+6
| | | | | | | | | | | | | | | | Upstream broke catalog generation with some over-eagre style cleanups. This brings in my pull request. Obtained from: https://github.com/lichray/nvi2/pull/88 Differential Revision: https://reviews.freebsd.org/D28594
* | Fix buildworld on Linux/macOS after nvi updateAlex Richardson2020-10-121-1/+1
| | | | | | | | | | | | | | This re-applies r365941 which was lost in the nvi update. Notes: svn path=/head/; revision=366634
* | Update nvi to 2.2.0-05ed8b9Baptiste Daroussin2020-10-0143-143/+239
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | This version incorporates many fixes in particular a fix for vi -w Another approach was proposed to merge those fixes (see review), I find it easier to track changes if we keep importing snapshot on regular basis PR: 241985 Reported by: fernape Differential Revision: https://reviews.freebsd.org/D26158 Notes: svn path=/head/; revision=366309
* | vi(1): Add URL to the vi/ex reference manual in the man pageFernando Apesteguía2020-09-251-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reported in PR 241985 The manual page references the "vi/ex reference manual" but there is no information about where to find that document. Add a reference to the manual in the SEE ALSO section since the Project hosts a copy of it[1]. Change sent upstream[2] If D26158 gets reviewed and committed, we could close that PR. [1] https://docs.freebsd.org/44doc/usd/13.viref/paper.pdf). [2] https://github.com/lichray/nvi2/pull/85 Submitted by: freebsd@tim.thechases.com Approved by: manpages (gbe@) Differential Revision: https://reviews.freebsd.org/D26163 Notes: svn path=/head/; revision=366148
* | Fix vi build on Linux/macOSAlex Richardson2020-09-211-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This absolute include causes a build failure on Linux for me: .../cheri/freebsd/contrib/nvi/cl/../common/common.h:10:10: fatal error: '/usr/include/db.h' file not found This change patches the file to use #include <db.h> instead until a solution has been found upstream. See also https://github.com/lichray/nvi2/issues/69 Reviewed By: bapt Differential Revision: https://reviews.freebsd.org/D26480 Notes: svn path=/head/; revision=365941
* | Update nvi to 2.2.0Baptiste Daroussin2020-09-09152-1621/+1564
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Main changes: * Vim-style expandtab option * Provides Turkish translation * Backspace now deletes \ rather than being escaped * T during motion commands is now VI-compatible * Encoding related fixes, such as UTF-8 detection * Fixed a number of memory management issues MFC after: 3 weeks Notes: svn path=/head/; revision=365499
* | Revert r362148.Yuri Pankov2020-06-221-10/+3
| | | | | | | | | | | | | | | | | | Breaks UTF-8 input for new or having only 7bit characters present files. Reported by: glebius Notes: svn path=/head/; revision=362515
* | nvi: fallback to ISO8859-1 as last resortYuri Pankov2020-06-131-3/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | Current logic of using user's locale encoding that is UTF-8 doesn't make much sense if we already failed the looks_utf8() check and skipped encoding set using "fileencoding" as being UTF-8 as well; fallback to ISO8859-1 in that case. Reviewed by: Zhihao Yuan <lichray@gmail.com> Differential Revision: https://reviews.freebsd.org/D24919 Notes: svn path=/head/; revision=362148
* | vi.1: Fix a typoMateusz Piotrowski2019-12-091-2/+2
| | | | | | | | | | | | | | | | | | Reviewed by: bcr Approved by: bcr (mentor) Differential Revision: https://reviews.freebsd.org/D22734 Notes: svn path=/head/; revision=355564
* | vi: fix UTF-8 detection.Yuri Pankov2018-11-261-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | PR: 202290 Submitted by: lampa@fit.vutbr.cz Reviewed by: bapt Approved by: kib (mentor, implicit) MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D17950 Notes: svn path=/head/; revision=340976
* | nvi: remove superfluous space before ^\Ed Maste2018-11-091-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | This fixes alignment in vi's 'viusage' command and has been fixed upstream and in OpenBSD. Submitted by: Raf Czlonka (github:rjc) MFC after: 1 week Pull Request: https://github.com/freebsd/freebsd/pull/122 Notes: svn path=/head/; revision=340288
* | Update nvi to 2.1.3 which fixes the data corruption when locale conversionBaptiste Daroussin2015-04-10177-26258/+1844
|\| | | | | | | | | | | | | failed Notes: svn path=/head/; revision=281373
* | Vendor import nvi-2.1.2-c80f493b038 a multikey mapping fixPeter Wemm2013-12-083-10/+16
|\| | | | | | | | | | | | | PR: bin/182463 Notes: svn path=/head/; revision=259088
* | Merge nvi-2.1.1 -> 2.1.2Peter Wemm2013-11-117-1203/+2339
|\| | | | | | | Notes: svn path=/head/; revision=257999
* | Update nvi-1.79 to 2.1.1-4334a8297fPeter Wemm2013-08-11263-29973/+12759
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is the gsoc-2011 project to clean up and backport multibyte support from other nvi forks in a form we can use. USE_WIDECHAR is on unless building for the rescue crunchgen. This should allow editing in the native locale encoding. USE_ICONV depends on make.conf having 'WITH_ICONV=YES' for now. This adds the ability to do things like edit a KOI8-R file while having $LANG set to (say) en_US.UTF-8. iconv is used to transcode the characters for display. Other points: * It uses gencat and catopen/etc instead of homegrown msg catalog stuff. * A lot of stuff has been trimmed out, eg: the perl and tcl bindings which we could never use in base anyway. * It uses ncursesw when in widechar mode. This could be interesting. GSoC info: http://www.google-melange.com/gsoc/proposal/review/google/gsoc2011/zy/1 Repo at: https://github.com/lichray/nvi2 Obtained from: Zhihao Yuan <lichray@gmail.com> Notes: svn path=/head/; revision=254225
| * Post-cvs2svn flatten pass.Peter Wemm2013-08-11292-98525/+0
| | | | | | | | Notes: svn path=/vendor/nvi/dist/; revision=254210
| * Fix deadlock between warning display and refresh engines. This fixSheldon Hearn2002-01-311-8/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | is taken from nvi-1.51.5. PR: bin/3170 Reported by: fenner Obtained from: skimo@kotnet.org MFC after: 1 month Notes: svn path=/vendor/nvi/dist/; revision=90025
* | Rename O_DIRECTORY to O_TMP_DIRECTORY to avoid shadowing the fcntl.hJaakko Heinonen2013-05-153-6/+6
| | | | | | | | | | | | | | | | | | | | O_DIRECTORY flag. PR: bin/173924 Obtained from: git://repo.or.cz/nvi.git Notes: svn path=/head/; revision=250667
* | Fix two instances of undefined behaviour in contrib/nvi.Dimitry Andric2013-02-162-4/+6
| | | | | | | | | | | | | | | | | | | | Found by: clang ToT Obtained from: NetBSD Reviewed by: jh MFC after: 3 days Notes: svn path=/head/; revision=246874
* | Fixes from NetBSD for nvi visual mode:Jaakko Heinonen2010-05-282-14/+37
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Fix handling of ^@ when reading an ex command. Don't try to replay the previous input. - Fix handling of ^C in insert mode and when reading an ex command. Repeating an interrupted input could cause a crash and interrupting ex command input could cause a file corruption. - Fix a bug which causes crashes in file name completion when a file name is longer than the screen width. - When an error occurs in v_txt(), leave the input mode. PR: bin/21089, bin/136393 Obtained from: NetBSD Notes: svn path=/head/; revision=208612
* | Fix misspelling of "substitution".Jaakko Heinonen2010-05-282-2/+2
| | | | | | | | | | | | | | | | PR: bin/130874 Submitted by: Yoshihiro Ota Notes: svn path=/head/; revision=208611
* | - Sort the headers per style(9)Rong-En Fan2007-06-061-1/+1
| | | | | | | | | | | | | | | | Reminded by: yar Approved by: delphij (mentor, implicit) Notes: svn path=/head/; revision=170371
* | - Fix crash with ncurses on FreeBSD/amd64 CURRENT by including missingRong-En Fan2007-06-061-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | header <term.h>, which is required by both tputs() and tgoto(). Without this header, nvi crashes with the call to tputs() at line 114. This is because the first argument of tputs() is a pointer, and the returned pointer from tgoto() is casted to an integer by compiler. For some reasons, this only crashes on amd64+CURRENT. On 6.x system, this does not happen. PR: 101248 Reported by: yar, infofarmer, Roland Smith Tested by: infofarmer, delphij, rafan Approved by: delphij (mentor) Notes: svn path=/head/; revision=170356
* | Remove the dates from these files. They serve no purpose and result inColin Percival2005-08-171-1/+1
| | | | | | | | | | | | | | | | | | these files spuriously changing each time they are built. Also, add $FreeBSD$ tags, because cvs is unhappy otherwise. Notes: svn path=/head/; revision=149196
* | Remove ru_SU, we don't need it in favour to ru_RUAndrey A. Chernov2003-06-234-651/+0
| | | | | | | | | | | | | | Submitted by: ru Notes: svn path=/head/; revision=116731
* | Copy ru_SU spelling fixes to ru_RUAndrey A. Chernov2003-06-233-9/+9
| | | | | | | | | | | | | | Submitted by: ru Notes: svn path=/head/; revision=116730
* | Fixes for the Russian translations of the messages.John Polstra2003-03-082-8/+8
| | | | | | | | | | | | | | | | | | | | PR: bin/48035, bin/48036 Submitted by: Sergey A.Osokin <osa@FreeBSD.org.ru> Reviewed by: ache MFC after: 4 weeks Notes: svn path=/head/; revision=112012
* | Merge rev 1.1.1.3 from vendor branch: fix refresh / warning deadlockSheldon Hearn2002-01-311-8/+9
| | | | | | | | Notes: svn path=/head/; revision=90026
* | Merge rev 1.1.1.2 from the vendor branch: fix leftright scrolling forSheldon Hearn2002-01-311-1/+4
| | | | | | | | | | | | | | long lines Notes: svn path=/head/; revision=90023
* | Add $FreeBSD$ CVS Id tag so that I can merge rev 1.1.1.2 from theSheldon Hearn2002-01-311-0/+4
| | | | | | | | | | | | | | | | vendor branch. This file was taken off the vendor branch in 1998, before we started enforcing the presence of CVS Id tags. :-( Notes: svn path=/head/; revision=90022
* | This commit was generated by cvs2svn to compensate for changes in r90019,Sheldon Hearn2002-01-311-2/+2
|\| | | | | | | | | | | | | which included commits to RCS files with non-trunk default branches. Notes: svn path=/head/; revision=90020
| * Fix core dump in left-right screen scrolling for long lines.Sheldon Hearn2002-01-312-3/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The nvi maintainer expects this patch to be included in the upcoming nvi-1.81.6 unless a better fix presents itself. The MFC reminder below should be taken as a cue to MFC rev 1.1.1.2 of vs_relative.c as well. PR: bin/26869 Reported by: Alex Semenyaka <alexs@snark.ratmir.ru> Obtained from: skimo@kotnet.org (via "Alexey V. Neyman" <alex.neyman@auriga.ru>) MFC after: 1 month Notes: svn path=/vendor/nvi/dist/; revision=90019
* | This commit was generated by cvs2svn to compensate for changes in r89010,Sheldon Hearn2002-01-071-8/+12
|\| | | | | | | | | | | | | which included commits to RCS files with non-trunk default branches. Notes: svn path=/head/; revision=89011
| * Import patch from vendor (taken from nvi-1.81.5) that fixes problematicSheldon Hearn2002-01-071-8/+12
| | | | | | | | | | | | | | | | | | | | | | interaction between the leftright and number options. PR: bin/23912 Reported by: "Stephen D. Spencer" <gladiatr@boneyard.lawrence.ks.us> Obtained from: skimo@kotnet.org Notes: svn path=/vendor/nvi/dist/; revision=89010
* | o nvi failed to correctly handle EINTR returned from tcsetattr(), exitingRobert Watson2001-11-091-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | instead of recovering, which happens in particular during a rapid series of SIGWINCH's. This change forces nvi to loop on the call in the event that the call is interrupted. Interestingly, I submitted this bug report in 1998, and a solution was posted shortly thereafter by Matthias Buelow; it's been sitting in the PR database ever since. Note: this takes this file off the vendor branch. If and when we find a vendor for this code, the fix should be given back to them. PR: bin/8438 Submitted by: Matthias Buelow <mkb@altair.mayn.de> MFC after: 1 month Notes: svn path=/head/; revision=86201
* | Close buffer overflow noted in security advisory DSA-085.Jordan K. Hubbard2001-10-261-1/+1
| | | | | | | | | | | | | | | | Submitted by: Koga Youichirou <y-koga@jp.FreeBSD.org> Obtained from: Debian Notes: svn path=/head/; revision=85526
* | Fix an underflow resulting from the assumption !O_ISSET(sp, O_LEFTRIGHT)Dima Dorfman2001-07-191-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (ironically, the assumption is in a code block which is conditional on its converse). This isn't strictly the correct fix; it's more of a workaround to prevent an infinite loop. The correct fix (see ports/editors/nvi-devel/files/patch-vi-relative r1.1) would take a file off the vendor branch, but since the result for this version of nvi is identical, this route was elected. PR: 28687 Approved by: -developers Notes: svn path=/head/; revision=79950
* | It is just stupid to have to do ``<ESC>!rm -f %'' to write a file you own.David E. O'Brien2001-07-091-0/+29
| | | | | | | | | | | | | | | | | | So lets stop that nonsense and allow `w!' to do something useful. Submitted by: green Notes: svn path=/head/; revision=79444
* | Update/improve Ukrainian translation.Maxim Sobolev2001-04-172-580/+580
| | | | | | | | | | | | | | Submitted by: Olexander Kunytsa <kunia@istc.kiev.ua> (author of translation) Notes: svn path=/head/; revision=75583
* | more(3) -> more(1), and add $FreeBSD$Ben Smithurst2001-01-031-1/+2
| | | | | | | | | | | | | | | | PR: 24033 Submitted by: Rich Morin <rdm@cfcl.com> Notes: svn path=/head/; revision=70641
* | This commit was generated by cvs2svn to compensate for changes in r69482,Ruslan Ermilov2000-12-012-0/+2
|\| | | | | | | | | | | | | which included commits to RCS files with non-trunk default branches. Notes: svn path=/head/; revision=69483
| * Follow POLA and bind the <End> key to the `$' command.Ruslan Ermilov2000-12-012-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is committed to the vendor (BOSTIC) branch because it was accepted (committed) by ``nvi'' maintainers: On Fri, Dec 01, 2000 at 03:51:14PM +0100, Sven Verdoolaege wrote: [...] > RCS file: /b/CVSROOT/vi/cl/cl_bsd.c,v > Working file: cl_bsd.c > head: 8.32 > branch: > locks: strict > access list: > symbolic names: > nvi1-81-1: 8.31 > nvi1-81-0: 8.30 > nvi1-80: 8.29.0.2 > keyword substitution: kv > total revisions: 32; selected revisions: 1 > description: > ---------------------------- > revision 8.32 > date: 2000/12/01 13:56:17; author: skimo; state: Exp; lines: +2 -1 > allow use of <End> key on AT-compatible keyboards (Ruslan Ermilov <ru@FreeBSD.org>) > ============================================================================= > > RCS file: /b/CVSROOT/vi/cl/cl_term.c,v > Working file: cl_term.c > head: 10.28 > branch: > locks: strict > access list: > symbolic names: > nvi1-81-1: 10.27 > nvi1-81-0: 10.23 > nvi1-80: 10.23.0.2 > keyword substitution: kv > total revisions: 47; selected revisions: 1 > description: > ---------------------------- > revision 10.28 > date: 2000/12/01 13:56:18; author: skimo; state: Exp; lines: +2 -1 > allow use of <End> key on AT-compatible keyboards (Ruslan Ermilov <ru@FreeBSD.org>) Notes: svn path=/vendor/nvi/dist/; revision=69482
* | Catch up to perl-5.6.0.Sheldon Hearn2000-12-011-14/+16
| | | | | | | | Notes: svn path=/head/; revision=69474
generated by cgit v1.2.3 (git 2.25.1) at 2026-01-30 03:24:16 +0000