contrib/nvi: fix -w option

[fernape]

Summary

Reported in PR 241985

Compose the "window=%s" option as a CHAR_T to be processed properly in
opts_set

Test Plan

Before the patch, trying this:

$ vi -w 10

shows an error:

set: no wo0 option: 'set all' gives all option values
Press Enter to continue:

And vi launches with as many lines as to fill the terminal screen

------------ BEGINING OF SCREEN

~
~
~
~
~
~
~
~
~
~
~
~
~
~
~
~
~
~
~
~
~
~
~
~
------------ END OF SCREEN

After the patch, thre is no error

$ vi -w 10

and the vi screen is limited to the specified amount of lines:

------------ BEGINING OF SCREEN

~
~
~
~
~
~
~
~
~
------------ END OF SCREEN

[fernape]

This one has been merged upstream

Should I withdraw this review?
What to do with the original PR?

head/contrib/nvi/CMakeLists.txt

 cmake_minimum_required(VERSION 3.9)
 
 get_property(is_multi_config GLOBAL PROPERTY GENERATOR_IS_MULTI_CONFIG)
 if(is_multi_config)
     set(CMAKE_CONFIGURATION_TYPES Debug Release CACHE STRING
         "Semicolon separated list of supported configuration types")
     mark_as_advanced(CMAKE_CONFIGURATION_TYPES)
 elseif(NOT CMAKE_BUILD_TYPE AND NOT CMAKE_C_FLAGS)
     message(WARNING "No CMAKE_BUILD_TYPE is selected")
 endif()
 
 project(nvi2 C)
 
 include(CheckIncludeFiles)
 include(CheckFunctionExists)
+include(CheckStructHasMember)
 include(CheckCSourceCompiles)
 
 mark_as_advanced(CMAKE_INSTALL_PREFIX)
 
 option(USE_WIDECHAR "Enable wide character support" ON)
 option(USE_ICONV "Enable iconv support" ON)
 
 add_compile_options(-fcolor-diagnostics)

 check_function_exists(__b64_ntop RESOLV_IN_LIBC)
 if(NOT RESOLV_IN_LIBC)
     find_library(RESOLV_LIBRARY resolv)
     target_link_libraries(nvi PRIVATE ${RESOLV_LIBRARY})
 endif()
 
 if(USE_WIDECHAR)
     find_library(CURSES_LIBRARY NAMES ncursesw cursesw curses HINTS /usr/lib)
+    find_library(TERMINFO_LIBRARY NAMES tinfow terminfo HINTS /usr/lib)
 
     # link to the wchar_t awared BSD libregex.a
     add_library(regex STATIC)
     target_sources(regex PRIVATE ${REGEX_SRCS})
     target_include_directories(regex PUBLIC regex)
     target_compile_definitions(regex PUBLIC __REGEX_PRIVATE)
     target_link_libraries(nvi PRIVATE regex)
 else()
     find_library(CURSES_LIBRARY NAMES ncurses curses HINTS /usr/lib)
+    find_library(TERMINFO_LIBRARY NAMES tinfo terminfo HINTS /usr/lib)
     target_compile_options(nvi PRIVATE -Wno-pointer-sign)
 endif()
 
-target_link_libraries(nvi PRIVATE ${CURSES_LIBRARY})
+target_link_libraries(nvi PRIVATE ${CURSES_LIBRARY} ${TERMINFO_LIBRARY})
 
 if(USE_ICONV)
-    check_function_exists(__iconv ICONV_IN_LIBC)
+    check_function_exists(iconv ICONV_IN_LIBC)
     if(NOT ICONV_IN_LIBC)
         find_path(ICONV_INCLUDE_DIR iconv.h)
         find_library(ICONV_LIBRARY iconv)
     endif()
 
     # detect the prototype of iconv(3)
     set(CMAKE_C_FLAGS_BACKUP "${CMAKE_C_FLAGS}")
     set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Werror")
if(USE_ICONV)
     set(CMAKE_REQUIRED_INCLUDES)
     set(CMAKE_REQUIRED_LIBRARIES)
     set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS_BACKUP}")
 
     target_include_directories(nvi PRIVATE ${ICONV_INCLUDE_DIR})
     target_link_libraries(nvi PRIVATE ${ICONV_LIBRARY})
 endif()
 
+check_function_exists(getprogname GETPROGNAME_IN_LIBC)
+check_function_exists(strlcpy STRLCPY_IN_LIBC)
+if(NOT GETPROGNAME_IN_LIBC OR NOT STRLCPY_IN_LIBC)
+    find_package(PkgConfig REQUIRED)
+    pkg_check_modules(LIBBSD libbsd-overlay)
+    add_definitions(${LIBBSD_CFLAGS})
+    target_link_libraries(nvi PRIVATE ${LIBBSD_LIBRARIES})
+endif()
+
+check_function_exists(dbopen DBOPEN_IN_LIBC)
+if(NOT DBOPEN_IN_LIBC)
+    target_link_libraries(nvi PRIVATE db1)
+endif()
+
 check_include_files(libutil.h HAVE_LIBUTIL_H)
 check_include_files(ncurses.h HAVE_NCURSES_H)
+check_include_files(ncursesw/ncurses.h HAVE_NCURSESW_NCURSES_H)
+check_include_files(pty.h HAVE_PTY_H)
 check_include_files(term.h HAVE_TERM_H)
+check_struct_has_member("struct dirent" d_namlen dirent.h HAVE_DIRENT_D_NAMLEN LANGUAGE C)
 
 configure_file(files/config.h.in config.h)
 
 set(vi_cv_path_preserve /var/tmp/vi.recover/)
 if(APPLE)
     set(vi_cv_path_msgcat /usr/local/share/vi/catalog/)
 else()
     set(vi_cv_path_msgcat /usr/share/vi/catalog/)
 endif()
 
 configure_file(files/pathnames.h.in pathnames.h)
 configure_file(files/recover.in recover @ONLY)

head/contrib/nvi/catalog/dump.c

 #include <ctype.h>
 #include <stdio.h>
 
 static void
 parse(FILE *fp)
 {
         int ch, s1, s2, s3;
 
-#define TESTD(s) {                                                      \
+#define TESTD(s) do {                                                   \
         if ((s = getc(fp)) == EOF)                                      \
                 return;                                                 \
         if (!isdigit(s))                                                \
                 continue;                                               \
-}
-#define TESTP {                                                         \
+} while (0)
+#define TESTP do {                                                      \
         if ((ch = getc(fp)) == EOF)                                     \
                 return;                                                 \
         if (ch != '|')                                                  \
                 continue;                                               \
-}
-#define MOVEC(t) {                                                      \
+} while (0)
+#define MOVEC(t) do {                                                   \
         do {                                                            \
                 if ((ch = getc(fp)) == EOF)                             \
                         return;                                         \
         } while (ch != (t));                                            \
-}
+} while (0)
         for (;;) {
                 MOVEC('"');
                 TESTD(s1);
                 TESTD(s2);
                 TESTD(s3);
                 TESTP;
                 putchar('"');
                 putchar(s1);

head/contrib/nvi/cl/cl.h

 /*-
  * Copyright (c) 1993, 1994
  *      The Regents of the University of California.  All rights reserved.
  * Copyright (c) 1993, 1994, 1995, 1996
  *      Keith Bostic.  All rights reserved.
  *
  * See the LICENSE file for redistribution information.
  */
 
 #ifdef USE_WIDECHAR
 #define _XOPEN_SOURCE_EXTENDED
 #endif
-#ifdef HAVE_NCURSES_H
+#ifdef HAVE_NCURSESW_NCURSES_H
+#include <ncursesw/ncurses.h>
+#elif defined HAVE_NCURSES_H
 #include <ncurses.h>
 #else
 #include <curses.h>
 #endif
 
 typedef struct _cl_private {
         char     ibuf[256];     /* Input keys. */