Add new visibletab functionality, etc.

Author: johnsonjh

ChangeLog

@@ -1,5 +1,10 @@
-OpenVi 7.0.3 -> OpenVi 7.0.4 (Unreleased): Wed Jan 26 08:37:21 2022
-	+ Nothing yet ...
+OpenVi 7.0.3 -> OpenVi 7.0.4: Wed Jan 26 13:09:45 2022
+	+ New feature: "set visibletab" (abbrev "set vt") which toggles
+	  displaying tabs visibly while editing, useful for Makefiles, etc.
+	+ Decrease the width of the line-number column by one row
+	+ Increase the length of the divider decoration string (by 2x)
+	+ Improve the GNUmakefile to avoid remaking any non-stale targets
+	+ Portably seed the standard random number generator
 
 OpenVi 7.0.2 -> OpenVi 7.0.3: Wed Jan 26 08:31:28 2022
 	+ GNUmakefile "install" targets now install documentation (man pages)

GNUmakefile

@@ -5,7 +5,6 @@
 # Default C compiler and CFLAGS
 CC          ?= cc
 CFLAGS      += -std=gnu99 -I./cl -I./include -I. -MD
-#CFLAGS     += -DVISIBLE_TAB_CHARS
 
 ###############################################################################
 
@@ -255,7 +254,7 @@ endif # DEBUG
 
 ###############################################################################
 
-all: vi ex view docs/USD.doc/vi.man/vi.1
+all: bin/vi bin/ex bin/view docs/USD.doc/vi.man/vi.1
 
 ###############################################################################
 
@@ -313,16 +312,16 @@ vi: bin/vi
 
 ###############################################################################
 
-bin/ex: vi
+bin/ex: bin/vi
 	$(LNS) "vi" "./bin/ex"
 
 .PHONY: ex
 ex: bin/ex
 	@$(TRUE)
 
-###############################################################################
+##############################################################################
 
-bin/view: vi
+bin/view: bin/vi
 	$(LNS) "vi" "./bin/view"
 
 .PHONY: view
@@ -331,7 +330,7 @@ view: bin/view
 
 ###############################################################################
 
-install: vi ex view virecover docs/USD.doc/vi.man/vi.1
+install: bin/vi bin/ex bin/view build/virecover docs/USD.doc/vi.man/vi.1
 	$(TEST) -d "/tmp/vi.recover" ||                                           \
         $(MKDIR) "/tmp/vi.recover"
 	$(TEST) -d "/tmp/vi.recover" &&                                           \
@@ -370,7 +369,7 @@ install-strip: install
 
 ###############################################################################
 
-strip: vi
+strip: /bin/vi
 	$(STRIP) "./bin/vi"
 
 ###############################################################################

common/mkstemp.c

@@ -3,6 +3,8 @@
 #include <errno.h>
 #include <fcntl.h>
 #include <stdio.h>
+#include <time.h>
+#include <bsd_unistd.h>
 #include <bsd_stdlib.h>
 #include <bsd_string.h>
 #include <sys/stat.h>
@@ -13,6 +15,8 @@ obsd_mkstemp (char *template_name)
 {
   int i, j, fd, len, index;
 
+  srand(time(NULL) ^ getpid());
+
   static const char letters[]
       = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789";
 

common/options.c

@@ -171,6 +171,8 @@ OPTLIST const optlist[] = {
 	{"ttywerase",	f_ttywerase,	OPT_0BOOL,	0},
 /* O_VERBOSE	  4.4BSD */
 	{"verbose",	NULL,		OPT_0BOOL,	0},
+/* O_VISIBLETAB	  OpenVi */
+	{"visibletab",	f_reformat,	OPT_0BOOL,	0},
 /* O_W1200	    4BSD */
 	{"w1200",	f_w1200,	OPT_NUM,	OPT_NDISP|OPT_NOSAVE},
 /* O_W300	    4BSD */
@@ -227,6 +229,7 @@ static OABBREV const abbrev[] = {
 	{"ts",		O_TABSTOP},		/*     4BSD */
 	{"tty",		O_TERM},		/*     4BSD (undocumented) */
 	{"ttytype",	O_TERM},		/*     4BSD (undocumented) */
+	{"vt",		O_VISIBLETAB},		/*   OpenVi */
 	{"w",		O_WINDOW},		/* O'Reilly */
 	{"wa",		O_WRITEANY},		/*     4BSD */
 	{"wi",		O_WINDOW},		/*     4BSD (undocumented) */

docs/USD.doc/vi.man/vi.1

@@ -2534,6 +2534,10 @@ Select an alternate erase algorithm.
 .Nm vi
 only.
 Display an error message for every error.
+.It Cm visibletab Bq off
+.Nm vi
+only.
+Displays tabs visibly while editing.
 .It Cm w300 Bq no default
 .Nm vi
 only.

docs/help

@@ -209,15 +209,15 @@ unabbreviate: delete an abbreviation
 Edit options:
 noaltwerase     filec=""        nomodeline      nosearchincr    timeout
 autoindent      flash           noprint=""      nosecure        nottywerase
-autoprint       hardtabs=0      nonumber        shiftwidth=8    noverbose
-noautowrite     noiclower       nooctalr        noshowmatch     warn
-backup=""       noignorecase    open            noshowmode      window=35
-nobeautify      keytime=6       optimize        sidescroll=16   nowindowname
-cedit=""        noleftright     print=""        noslowopen      wraplen=0
-columns=80      lines=36        prompt          nosourceany     wrapmargin=0
-comment         nolisp          readonly        tabstop=8       wrapscan
-noedcompatible  nolist          noredraw        taglength=0     nowriteany
-escapetime=2    lock            remap           tags="tags"
+autoprint       hardtabs=0      nonumber        shiftwidth=8    novisibletab
+noautowrite     noiclower       nooctalr        noshowmatch     noverbose
+backup=""       noignorecase    open            noshowmode      warn
+nobeautify      keytime=6       optimize        sidescroll=16   window=35
+cedit=""        noleftright     print=""        noslowopen      nowindowname
+columns=80      lines=36        prompt          nosourceany     wraplen=0
+comment         nolisp          readonly        tabstop=8       wrapmargin=0
+noedcompatible  nolist          noredraw        taglength=0     wrapscan
+escapetime=2    lock            remap           tags="tags"     nowriteany
 noerrorbells    magic           report=5        term="xterm"
 exrc            matchtime=7     ruler           noterse
 noextended      mesg            scroll=17       notildeop

ex/version.h

@@ -36,10 +36,10 @@
 
 #if defined(DB185EMU) || defined(_DB_185_H_)
 #define	VI_VERSION \
-	"Version 7.0.4-dev (OpenVi) 10/25/2021 - using Berkeley DB 1.85 emulation"
+	"Version 7.0.4 (OpenVi) 10/25/2021 - using Berkeley DB 1.85 emulation"
 #else
 #define VI_VERSION \
-	"Version 7.0.4-dev (OpenVi) 10/25/2021"
+	"Version 7.0.4 (OpenVi) 10/25/2021"
 #endif /* if defined(DB185EMU) || defined(_DB_185_H_) */
 
 #endif /* ifndef _VERSION_H */

vi/vi.h

@@ -316,8 +316,8 @@ typedef struct _vi_private {
 /* Vi private area. */
 #define	VIP(sp)	((VI_PRIVATE *)((sp)->vi_private))
 
-#define	O_NUMBER_FMT	"%7lu "			/* O_NUMBER format, length. */
-#define	O_NUMBER_LENGTH	8
+#define	O_NUMBER_FMT	"%6lu "			/* O_NUMBER format, length. */
+#define	O_NUMBER_LENGTH	7
 #define	SCREEN_COLS(sp)				/* Screen columns. */	\
 	((O_ISSET((sp), O_NUMBER) ? (sp)->cols - O_NUMBER_LENGTH : (sp)->cols))
 

vi/vs_line.c

@@ -21,12 +21,6 @@
 #include "../common/common.h"
 #include "vi.h"
 
-#ifdef VISIBLE_TAB_CHARS
-# define	TABCH	'~'
-#else
-# define	TABCH	' '
-#endif /* ifdef VISIBLE_TAB_CHARS */
-
 /*
  * vs_line --
  *	Update one line on the screen.
@@ -411,7 +405,10 @@ empty:					(void)gp->scr_addstr(sp,
 			while (chlen--) {
 				if (cbp >= ecbp)
 					FLUSH(gp, sp, cbp, cbuf);
-				*cbp++ = TABCH;
+				if (O_ISSET(sp, O_VISIBLETAB))
+				    *cbp++ = '~';
+				else
+				    *cbp++ = ' ';
 			}
 		else {
 			if (cbp + chlen >= ecbp)

vi/vs_msg.c

@@ -854,7 +854,7 @@ vs_divider(SCR *sp)
 	GS *gp;
 	size_t len;
 
-#define	DIVIDESTR	"+=+=+=+=+=+=+=+"
+#define	DIVIDESTR	"+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+"
 	len =
 	    sizeof(DIVIDESTR) - 1 > sp->cols ? sp->cols : sizeof(DIVIDESTR) - 1;
 	gp = sp->gp;