Important fix for back-end database file locking; also, switch back to using the system libc-provided mkstemp functions to elide some issues that would otherwise occur on networked filesystems.

Author: johnsonjh

ChangeLog

@@ -1,6 +1,9 @@
-OpenVi 7.0.5 -> OpenVi 7.0.6-dev (Unreleased): Thu Jan 27 14:25:39 2022
-	+ Add attribution for DragonflyBSD Project to `LICENSE` text
-	+ Correct `GNUmakefile` terse messages for `install` target
+OpenVi 7.0.5 -> OpenVi 7.0.6: Thu Jan 27 16:45:12 2022
+	+ Important fix for back-end database file locking; also, switch
+	  back to using the system libc-provided mkstemp functions to elide
+	  some issues that would otherwise occur on networked filesystems.
+	+ Add proper attribution for DragonflyBSD Project to `LICENSE` text
+	+ Correct `GNUmakefile` non-verbose messages for the `install` target
 	+ Clean-up excess and trailing whitespace from source files
 
 OpenVi 7.0.4 -> OpenVi 7.0.5: Thu Jan 27 11:00:46 2022

GNUmakefile

@@ -6,13 +6,13 @@
 CC          ?= cc
 OPTLEVEL    ?= -O2
 DEPFLAGS    ?= -MMD -MP
-CFLAGS      += -std=gnu99 -I"./include"
+CFLAGS      += -std=gnu99 -Iinclude -Idb -Icl -Iex -Ivi -Icommon
 
 ###############################################################################
 
 # Set DEBUG to enable debugging build
 #DEBUG       = 1
-DBGFLAGS    ?= -ggdb
+DBGFLAGS    ?= -ggdb -g3 -Og
 
 ###############################################################################
 
@@ -52,7 +52,7 @@ IUSGR        = root:bin
 ###############################################################################
 
 ifdef DEBUG
-   CFLAGS   += $(DBGFLAGS) -Wall -Wextra -DDEBUG -g3 -Og
+   CFLAGS   += $(DBGFLAGS) -Wall -Wextra -DDEBUG -DSTATISTICS -DHASH_STATISTICS
 else
    CFLAGS   += $(OPTLEVEL) -pipe -fomit-frame-pointer
 endif # DEBUG
@@ -130,7 +130,6 @@ SRCS = cl/basename.c \
 	   common/log.c \
 	   common/main.c \
 	   common/mark.c \
-	   common/mkstemp.c \
        common/msg.c \
 	   common/options.c \
 	   common/options_f.c \

cl/cl_funcs.c

@@ -619,51 +619,27 @@ cl_usage()
 	switch (pmode) {
 	case MODE_EX:
 		(void)fprintf(stderr, "Usage: "
-#ifndef DB185EMU
 #ifdef DEBUG
 		    "ex [ -FRrSsv ] [ -c cmd ] [ -t tag ] [ -w size ] [ -T tracefile ] [ file ... ]\n");
 #else
 		    "ex [ -FRrSsv ] [ -c cmd ] [ -t tag ] [ -w size ] [ file ... ]\n");
 #endif /* ifdef DEBUG */
-#else
-#ifdef DEBUG
-		    "ex [ -FRSsv ] [ -c cmd ] [ -t tag ] [ -w size ] [ -T tracefile ] [ file ... ]\n");
-#else
-		    "ex [ -FRSsv ] [ -c cmd ] [ -t tag ] [ -w size ] [ file ... ]\n");
-#endif /* ifdef DEBUG */
-#endif /* ifndef DB185EMU */
 		break;
 	case MODE_VI:
 		(void)fprintf(stderr, "Usage: "
-#ifndef DB185EMU
 #ifdef DEBUG
 		    "vi [ -eFRrS ] [ -c cmd ] [ -t tag ] [ -w size ] [ -T tracefile ] [ file ... ]\n");
 #else
 		    "vi [ -eFRrS ] [ -c cmd ] [ -t tag ] [ -w size ] [ file ... ]\n");
 #endif /* ifdef DEBUG */
-#else
-#ifdef DEBUG
-		    "vi [ -eFRS ] [ -c cmd ] [ -t tag ] [ -w size ] [ -T tracefile ] [ file ... ]\n");
-#else
-		    "vi [ -eFRS ] [ -c cmd ] [ -t tag ] [ -w size ] [ file ... ]\n");
-#endif /* ifdef DEBUG */
-#endif /* ifndef DB185EMU */
 		break;
 	case MODE_VIEW:
 		(void)fprintf(stderr, "Usage: "
-#ifndef DB185EMU
 #ifdef DEBUG
 		    "view [ -eFrS ] [ -c cmd ] [ -t tag ] [ -w size ] [ -T tracefile ] [ file ... ]\n");
 #else
 		    "view [ -eFrS ] [ -c cmd ] [ -t tag ] [ -w size ] [ file ... ]\n");
 #endif /* ifdef DEBUG */
-#else
-#ifdef DEBUG
-		    "view [ -eFS ] [ -c cmd ] [ -t tag ] [ -w size ] [ -T tracefile ] [ file ... ]\n");
-#else
-		    "view [ -eFS ] [ -c cmd ] [ -t tag ] [ -w size ] [ file ... ]\n");
-#endif /* ifdef DEBUG */
-#endif /* ifndef DB185EMU */
 		break;
 	}
 }

cl/cl_main.c

@@ -9,6 +9,8 @@
  * See the LICENSE file for redistribution information.
  */
 
+#include "../include/compat.h"
+
 #include <sys/types.h>
 #include <sys/queue.h>
 
@@ -30,6 +32,8 @@
 #include "../common/common.h"
 #include "cl.h"
 
+#undef open
+
 GS *__global_list;				/* GLOBAL: List of screens. */
 
 volatile sig_atomic_t cl_sigint;

cl/engine.c

@@ -825,7 +825,6 @@ slow(struct match *m, char *start, char *stop, sopno startst, sopno stopst)
 	return(matchp);
 }
 
-
 /*
  - step - map set of states reachable before char to set reachable after
  */

common/common.h

@@ -11,14 +11,10 @@
  *	@(#)common.h	10.13 (Berkeley) 9/25/96
  */
 
-#include <sys/time.h>
-
-#ifdef DB185EMU
-# include <db_185.h>
-#else
-# include <bsd_db.h>
-#endif /* ifdef DB185EMU */
+#include "../include/compat.h"
 
+#include <sys/time.h>
+#include <bsd_db.h>
 #include <regex.h>
 
 /*

common/cut.c

@@ -127,7 +127,6 @@ namecb:		CBNAME(sp, cbp, name);
 		cbp->flags = 0;
 	}
 
-
 	/* In line mode, it's pretty easy, just cut the lines. */
 	if (LF_ISSET(CUT_LINEMODE)) {
 		cbp->flags |= CB_LMODE;

common/exf.c

@@ -9,10 +9,14 @@
  * See the LICENSE file for redistribution information.
  */
 
+#include "../include/compat.h"
+
 #include <sys/queue.h>
 #include <sys/stat.h>
 #include <sys/time.h>
 
+#undef open
+
 /*
  * We include <sys/file.h>, because the flock(2) and open(2) #defines
  * were found there on historical systems.  We also include <bsd_fcntl.h>
@@ -33,14 +37,9 @@
 #include <bsd_unistd.h>
 
 #include <sys/types.h>
-#ifdef DB185EMU
-# include <db_185.h>
-#else
 # include <bsd_db.h>
-#endif /* ifdef DB185EMU */
 
 #include "common.h"
-#include "mkstemp.h"
 
 static int	file_backup(SCR *, char *, char *);
 static void	file_cinit(SCR *);
@@ -129,7 +128,7 @@ file_init(SCR *sp, FREF *frp, char *rcv_name, int flags)
 	struct stat sb;
 	size_t psize;
 	int fd, exists, open_err, readonly;
-	char *oname, tname[] = "/tmp/vi.XXXXXXXXXXXXXXXXXXXXXXXX";
+	char *oname, tname[] = "/tmp/vi.XXXXXX";
 
 	open_err = readonly = 0;
 
@@ -195,7 +194,7 @@ file_init(SCR *sp, FREF *frp, char *rcv_name, int flags)
 		 */
 		if (frp->tname != NULL)
 			goto err;
-		fd = obsd_mkstemp(tname);
+		fd = mkstemp(tname);
 		if (fd == -1 || fstat(fd, &sb) == -1 ||
 		    fchmod(fd, S_IRUSR | S_IWUSR) == -1) {
 			msgq(sp, M_SYSERR,

common/line.c

@@ -102,9 +102,6 @@ db_get(SCR *sp, recno_t lno, u_int32_t flags, char **pp, size_t *lenp)
 		l1 = TAILQ_FIRST(&sp->tiq)->lno;
 		l2 = TAILQ_LAST(&sp->tiq, _texth)->lno;
 		if (l1 <= lno && l2 >= lno) {
-#if defined(DEBUG) && 0
-	TRACE(sp, "retrieve TEXT buffer line %lu\n", (u_long)lno);
-#endif /* if defined(DEBUG) && 0 */
 			TAILQ_FOREACH(tp, &sp->tiq, q) {
 				if (tp->lno == lno)
 					break;
@@ -125,9 +122,6 @@ db_get(SCR *sp, recno_t lno, u_int32_t flags, char **pp, size_t *lenp)
 
 	/* Look-aside into the cache, and see if the line we want is there. */
 	if (lno == ep->c_lno) {
-#if defined(DEBUG) && 0
-	TRACE(sp, "retrieve cached line %lu\n", (u_long)lno);
-#endif /* if defined(DEBUG) && 0 */
 		if (lenp != NULL)
 			*lenp = ep->c_len;
 		if (pp != NULL)
@@ -158,9 +152,6 @@ err3:		if (lenp != NULL)
 	ep->c_len = data.size;
 	ep->c_lp = data.data;
 
-#if defined(DEBUG) && 0
-	TRACE(sp, "retrieve DB line %lu\n", (u_long)lno);
-#endif /* if defined(DEBUG) && 0 */
 	if (lenp != NULL)
 		*lenp = data.size;
 	if (pp != NULL)
@@ -180,9 +171,6 @@ db_delete(SCR *sp, recno_t lno)
 	DBT key;
 	EXF *ep;
 
-#if defined(DEBUG) && 0
-	TRACE(sp, "delete line %lu\n", (u_long)lno);
-#endif /* if defined(DEBUG) && 0 */
 	/* Check for no underlying file. */
 	if ((ep = sp->ep) == NULL) {
 		ex_emsg(sp, NULL, EXM_NOFILEYET);
@@ -235,9 +223,6 @@ db_append(SCR *sp, int update, recno_t lno, char *p, size_t len)
 	EXF *ep;
 	int rval;
 
-#if defined(DEBUG) && 0
-	TRACE(sp, "append to %lu: len %u {%.*s}\n", lno, len, MIN(len, 20), p);
-#endif /* if defined(DEBUG) && 0 */
 	/* Check for no underlying file. */
 	if ((ep = sp->ep) == NULL) {
 		ex_emsg(sp, NULL, EXM_NOFILEYET);
@@ -302,10 +287,6 @@ db_insert(SCR *sp, recno_t lno, char *p, size_t len)
 	EXF *ep;
 	int rval;
 
-#if defined(DEBUG) && 0
-	TRACE(sp, "insert before %lu: len %lu {%.*s}\n",
-	    (u_long)lno, (u_long)len, MIN(len, 20), p);
-#endif /* if defined(DEBUG) && 0 */
 	/* Check for no underlying file. */
 	if ((ep = sp->ep) == NULL) {
 		ex_emsg(sp, NULL, EXM_NOFILEYET);
@@ -360,11 +341,6 @@ db_set(SCR *sp, recno_t lno, char *p, size_t len)
 	DBT data, key;
 	EXF *ep;
 
-#if defined(DEBUG) && 0
-	TRACE(sp, "replace line %lu: len %lu {%.*s}\n",
-	    (u_long)lno, (u_long)len, MIN(len, 20), p);
-#endif /* if defined(DEBUG) && 0 */
-
 	/* Check for no underlying file. */
 	if ((ep = sp->ep) == NULL) {
 		ex_emsg(sp, NULL, EXM_NOFILEYET);