aboutsummaryrefslogtreecommitdiffstats
path: root/files
diff options
context:
space:
mode:
authorBaptiste Daroussin <bapt@FreeBSD.org>2020-10-01 04:25:54 +0000
committerBaptiste Daroussin <bapt@FreeBSD.org>2020-10-01 04:25:54 +0000
commitb4ed613595432ece6802d09bfabad18e09aa26f3 (patch)
treebd2db6b09b756624c1b2babdd12ea05a9dffcdaf /files
parent7cef6c685d23e4dcdf3f64b0b2ea92151e652db6 (diff)
downloadsrc-b4ed613595432ece6802d09bfabad18e09aa26f3.tar.gz
src-b4ed613595432ece6802d09bfabad18e09aa26f3.zip
Import nvi 2.2.0-05ed8b9vendor/nvi/2.2.0-05ed8b9vendor/nvi
This snapshot just brings a bunch of fixes in particular a fix for vi -w PR: 241985 Reported by: fernape
Notes
Notes: svn path=/vendor/nvi/dist/; revision=366307 svn path=/vendor/nvi/2.2.0-05ed8b9/; revision=366308; tag=vendor/nvi/2.2.0-05ed8b9
Diffstat (limited to 'files')
-rw-r--r--files/config.h.in9
-rw-r--r--files/pathnames.h.in5
2 files changed, 11 insertions, 3 deletions
diff --git a/files/config.h.in b/files/config.h.in
index f592f3551a54..f6444357678c 100644
--- a/files/config.h.in
+++ b/files/config.h.in
@@ -13,5 +13,14 @@
/* Define if you have <ncurses.h> */
#cmakedefine HAVE_NCURSES_H
+/* Define if you have <ncursesw/ncurses.h> */
+#cmakedefine HAVE_NCURSESW_NCURSES_H
+
+/* Define if you have <pty.h> */
+#cmakedefine HAVE_PTY_H
+
/* Define if you have <term.h> */
#cmakedefine HAVE_TERM_H
+
+/* Define if struct dirent has field d_namlen */
+#cmakedefine HAVE_DIRENT_D_NAMLEN
diff --git a/files/pathnames.h.in b/files/pathnames.h.in
index f1c2821f41c0..eb03f11d979a 100644
--- a/files/pathnames.h.in
+++ b/files/pathnames.h.in
@@ -13,9 +13,8 @@
#define _PATH_NEXRC ".nexrc"
#endif
-#ifndef _PATH_PRESERVE
-#define _PATH_PRESERVE "@vi_cv_path_preserve@"
-#endif
+/* On linux _PATH_PRESERVE is only writable by root */
+#define NVI_PATH_PRESERVE "@vi_cv_path_preserve@"
#ifndef _PATH_SYSEXRC
#define _PATH_SYSEXRC "/etc/vi.exrc"