Remove trailing whitespace.

18 files changed, 31 insertions, 31 deletions

diff --git a/usr.bin/vi/common/cut.c b/usr.bin/vi/common/cut.c
index 75c5b98..5700990 100644
--- a/usr.bin/vi/common/cut.c
+++ b/usr.bin/vi/common/cut.c
@@ -128,7 +128,7 @@ cut(sp, ep, namep, fm, tm, flags)
 	append = copy_one = copy_def = 0;
 	if (namep != NULL) {
 		name = *namep;
-		if (LF_ISSET(CUT_NUMREQ) || LF_ISSET(CUT_NUMOPT) && 
+		if (LF_ISSET(CUT_NUMREQ) || LF_ISSET(CUT_NUMOPT) &&
 		    (LF_ISSET(CUT_LINEMODE) || fm->lno != tm->lno)) {
 			copy_one = 1;
 			cb_rotate(sp);
diff --git a/usr.bin/vi/common/exf.c b/usr.bin/vi/common/exf.c
index 3718342..10ff7f1 100644
--- a/usr.bin/vi/common/exf.c
+++ b/usr.bin/vi/common/exf.c
@@ -759,7 +759,7 @@ file_m3(sp, ep, force)
 /*
  * file_lock --
  *	Get an exclusive lock on a file.
- * 
+ *
  * XXX
  * The default locking is flock(2) style, not fcntl(2).  The latter is
  * known to fail badly on some systems, and its only advantage is that
@@ -804,7 +804,7 @@ file_lock(name, fdp, fd, iswrite)
 	arg.l_whence = 0;		/* SEEK_SET */
 	arg.l_start = arg.l_len = 0;
 	arg.l_pid = 0;
-	
+
 	/* If the file descriptor isn't opened for writing, it must fail. */
 	if (!iswrite) {
 		if (name == NULL || fdp == NULL)
@@ -814,7 +814,7 @@ file_lock(name, fdp, fd, iswrite)
 		*fdp = fd;
 		didopen = 1;
 	}
-		
+
 	errno = 0;
 	if (!fcntl(fd, F_SETLK, &arg))
 		return (LOCK_SUCCESS);
diff --git a/usr.bin/vi/common/main.c b/usr.bin/vi/common/main.c
index 4ed059d..33cb4b2 100644
--- a/usr.bin/vi/common/main.c
+++ b/usr.bin/vi/common/main.c
@@ -605,7 +605,7 @@ gs_end(gp)
  * user's effective ID (or that the user's effective ID be root) and the
  * local .exrc files to be owned by the user's effective ID.  In all cases,
  * the file cannot be writeable by anyone other than its owner.
- * 
+ *
  * In O'Reilly ("Learning the VI Editor", Fifth Ed., May 1992, page 106),
  * it notes that System V release 3.2 and later has an option "[no]exrc".
  * The behavior is that local .exrc files are read only if the exrc option
@@ -613,7 +613,7 @@ gs_end(gp)
  * .exrc files were not read.  The problem this was intended to solve was
  * that System V permitted users to give away files, so there's no possible
  * ownership or writeability test to ensure that the file is safe.
- * 
+ *
  * POSIX 1003.2-1992 standardized exrc as an option.  It required the exrc
  * option to be off by default, thus local .exrc files are not to be read
  * by default.  The Rationale noted (incorrectly) that this was a change
@@ -621,7 +621,7 @@ gs_end(gp)
  * system security.  POSIX also required that vi check the effective user
  * ID instead of the real user ID, which is why we've switched from historic
  * practice.
- * 
+ *
  * We initialize the exrc variable to off.  If it's turned on by the system
  * or $HOME .exrc files, and the local .exrc file passes the ownership and
  * writeability tests, then we read it.  This breaks historic 4BSD practice,
@@ -644,7 +644,7 @@ exrc_isok(sp, sbp, path, rootown, rootid)
 
 	/* Check ownership permissions. */
 	euid = geteuid();
-	if (!(rootown && sbp->st_uid == 0) && 
+	if (!(rootown && sbp->st_uid == 0) &&
 	    !(rootid && euid == 0) && sbp->st_uid != euid) {
 		emsg = rootown ?
 		    "not owned by you or root" : "not owned by you";
diff --git a/usr.bin/vi/common/options.c b/usr.bin/vi/common/options.c
index 089a7b8..61396a3 100644
--- a/usr.bin/vi/common/options.c
+++ b/usr.bin/vi/common/options.c
@@ -384,7 +384,7 @@ opts_set(sp, usage, argv)
 	OPTION *spo;
 	u_long value, turnoff;
 	int ch, equals, offset, qmark, rval;
-	char *endp, *name, *p, *sep; 
+	char *endp, *name, *p, *sep;
 
 	disp = NO_DISPLAY;
 	for (rval = 0; argv[0]->len != 0; ++argv) {
diff --git a/usr.bin/vi/common/signal.c b/usr.bin/vi/common/signal.c
index 47a5e5b..362c0fb 100644
--- a/usr.bin/vi/common/signal.c
+++ b/usr.bin/vi/common/signal.c
@@ -66,7 +66,7 @@ static void	sig_sync __P((int, u_int));
  * The assumptions:
  *	1: The DB routines are not reentrant.
  *	2: The curses routines may not be reentrant.
- *	
+ *
  * SIGALRM, SIGHUP, SIGTERM
  *	Used for file recovery.  The DB routines can't be reentered, so
  *	the vi routines that call DB block all three signals (see line.c).
@@ -300,7 +300,7 @@ sig_end()
 	 return;
 }
 
-/* 
+/*
  * busy_on --
  *	Set a busy message timer.
  */
@@ -423,7 +423,7 @@ h_alrm(signo)
 	/* XXX: Get the current time of day; if this fails, we're dead. */
 	if (gettimeofday(&tod, NULL))
 		goto ret;
-	
+
 	/*
 	 * Fire any timers that are past due, or any that are due
 	 * in a tenth of a second or less.
diff --git a/usr.bin/vi/common/term.c b/usr.bin/vi/common/term.c
index 08467a5..463b8f7 100644
--- a/usr.bin/vi/common/term.c
+++ b/usr.bin/vi/common/term.c
@@ -330,7 +330,7 @@ term_push(sp, s, nchars, flags)
 {
 	IBUF *tty;
 	size_t total;
-	
+
 	/* If we have room, stuff the keys into the buffer. */
 	tty = sp->gp->tty;
 	if (nchars <= tty->next ||
@@ -563,7 +563,7 @@ remap:		qp = seq_find(sp, NULL, &tty->ch[tty->next], tty->cnt,
 			goto loop;
 
 		/* If remapping characters, push the character on the queue. */
-		if (O_ISSET(sp, O_REMAP)) { 
+		if (O_ISSET(sp, O_REMAP)) {
 			if (init_nomap) {
 				if (term_push(sp, qp->output + qp->ilen,
 				    qp->olen - qp->ilen, CH_MAPPED))
diff --git a/usr.bin/vi/ex/ex.c b/usr.bin/vi/ex/ex.c
index 77666ca0..66dddb0 100644
--- a/usr.bin/vi/ex/ex.c
+++ b/usr.bin/vi/ex/ex.c
@@ -263,7 +263,7 @@ static EXCMDLIST const cmd_subagain =
 	    "repeat the last subsitution"};
 
 /* Special command structure for :d[flags]. */
-static EXCMDLIST const cmd_del2 = 
+static EXCMDLIST const cmd_del2 =
 	{"delete",	ex_delete,	E_ADDR2|E_AUTOPRINT|E_NORC,
 	    "1bca1",
 	    "[line [,line]] d[elete][flags] [buffer] [count] [flags]",
@@ -371,7 +371,7 @@ loop:	if (nl) {
 	 */
 	if (cmdlen == 0 && (!IN_EX_MODE(sp) || ep == NULL || !blank))
 		return (0);
-		
+
 	/* Initialize the structure passed to underlying functions. */
 	memset(&exc, 0, sizeof(EXCMDARG));
 	exp = EXP(sp);
diff --git a/usr.bin/vi/ex/ex_append.c b/usr.bin/vi/ex/ex_append.c
index b819f5a..bb3f618 100644
--- a/usr.bin/vi/ex/ex_append.c
+++ b/usr.bin/vi/ex/ex_append.c
@@ -158,7 +158,7 @@ aci(sp, ep, cmdp, cmd)
 
 	if (sex_get(sp, ep, sp->tiqp, 0, flags) != INP_OK)
 		goto err;
-	
+
 	/*
 	 * If doing a change, replace lines for as long as possible.  Then,
 	 * append more lines or delete remaining lines.  Changes to an empty
diff --git a/usr.bin/vi/ex/ex_args.c b/usr.bin/vi/ex/ex_args.c
index 74f94f3..4dfc18e 100644
--- a/usr.bin/vi/ex/ex_args.c
+++ b/usr.bin/vi/ex/ex_args.c
@@ -210,7 +210,7 @@ ex_rew(sp, ep, cmdp)
 	for (frp = sp->frefq.cqh_first;
 	    frp != (FREF *)&sp->frefq; frp = frp->q.cqe_next)
 		F_CLR(frp, FR_CURSORSET | FR_FNONBLANK);
-	
+
 	/* Switch to the first one. */
 	sp->cargv = sp->argv;
 	if ((frp = file_add(sp, *sp->cargv)) == NULL)
@@ -239,7 +239,7 @@ ex_args(sp, ep, cmdp)
 		(void)ex_printf(EXCOOKIE, "No file list to display.\n");
 		return (0);
 	}
-		
+
 	col = len = sep = 0;
 	for (cnt = 1, ap = sp->argv; *ap != NULL; ++ap) {
 		col += len = strlen(*ap) + sep + (ap == sp->cargv ? 2 : 0);
diff --git a/usr.bin/vi/ex/ex_argv.c b/usr.bin/vi/ex/ex_argv.c
index bb033e2..63d820e 100644
--- a/usr.bin/vi/ex/ex_argv.c
+++ b/usr.bin/vi/ex/ex_argv.c
@@ -146,7 +146,7 @@ argv_exp1(sp, ep, excp, cmd, cmdlen, is_bang)
 		goto ret;
 
 	(void)argv_exp0(sp, ep, excp, bp, len);
-		
+
 ret:	FREE_SPACE(sp, bp, blen);
 	return (0);
 }
diff --git a/usr.bin/vi/ex/ex_subst.c b/usr.bin/vi/ex/ex_subst.c
index 5e52e79..de413f8 100644
--- a/usr.bin/vi/ex/ex_subst.c
+++ b/usr.bin/vi/ex/ex_subst.c
@@ -112,7 +112,7 @@ ex_substitute(sp, ep, cmdp)
 	 * state of the 'c' and 'g' suffices.
 	 */
 	sp->c_suffix = sp->g_suffix = 0;
-	
+
 	/*
 	 * Get the pattern string, toss escaped characters.
 	 *
diff --git a/usr.bin/vi/ex/ex_util.c b/usr.bin/vi/ex/ex_util.c
index 67c1039..a32b2a4 100644
--- a/usr.bin/vi/ex/ex_util.c
+++ b/usr.bin/vi/ex/ex_util.c
@@ -113,7 +113,7 @@ ex_sleave(sp)
 	/* Ignore sessions not using tty's. */
 	if (!F_ISSET(sp->gp, G_STDIN_TTY))
 		return (1);
-	
+
 	exp = EXP(sp);
 	if (tcgetattr(STDIN_FILENO, &exp->leave_term)) {
 		msgq(sp, M_SYSERR, "tcgetattr");
diff --git a/usr.bin/vi/svi/svi_refresh.c b/usr.bin/vi/svi/svi_refresh.c
index 0477361..9cb2dce 100644
--- a/usr.bin/vi/svi/svi_refresh.c
+++ b/usr.bin/vi/svi/svi_refresh.c
@@ -735,7 +735,7 @@ svi_modeline(sp, ep)
 	 * We put down the file name, the ruler, the mode and the dirty flag.
 	 * If there's not enough room, there's not enough room, we don't play
 	 * any special games.  We try to put the ruler in the middle and the
-	 * mode and dirty flag at the end.  
+	 * mode and dirty flag at the end.
 	 *
 	 * !!!
 	 * Leave the last character blank, in case it's a really dumb terminal
@@ -765,7 +765,7 @@ svi_modeline(sp, ep)
 			ADDCH(*p);
 		standend();
 	}
-		
+
 	/*
 	 * Display the ruler.  If we're not at the midpoint yet, move there.
 	 * Otherwise, just add in two extra spaces.
diff --git a/usr.bin/vi/svi/svi_term.c b/usr.bin/vi/svi/svi_term.c
index 2b2add3..a6ff7bd 100644
--- a/usr.bin/vi/svi/svi_term.c
+++ b/usr.bin/vi/svi/svi_term.c
@@ -280,7 +280,7 @@ svi_fmap(sp, stype, from, flen, to, tlen)
 	 */
 	{ int n; char *sbp, sbuf[1024];
 	  static const char codes[] = {
-/*  0-10 */	'0', '1', '2', '3', '4', '5', '6', '7', '8', '9', ';', 
+/*  0-10 */	'0', '1', '2', '3', '4', '5', '6', '7', '8', '9', ';',
 /* 11-19 */	'1', '2', '3', '4', '5', '6', '7', '8', '9',
 /* 20-63 */	'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M',
 		'N', 'O', 'P', 'Q', 'R', 'S', 'T', 'U', 'V', 'W', 'X', 'Y', 'Z',
diff --git a/usr.bin/vi/vi/v_mark.c b/usr.bin/vi/vi/v_mark.c
index 797e76b..973430c 100644
--- a/usr.bin/vi/vi/v_mark.c
+++ b/usr.bin/vi/vi/v_mark.c
@@ -185,7 +185,7 @@ mark(sp, ep, vp, cmd)
 	/*
 	 * Forward marks are always line oriented, and it's set in the
 	 * vcmd.c table.  Backward marks that start and stop at column
-	 * 0 of the line are also line mode commands. 
+	 * 0 of the line are also line mode commands.
 	 */
 	if (vp->m_start.cno == 0 && vp->m_stop.cno == 0)
 		F_SET(vp, VM_LMODE);
diff --git a/usr.bin/vi/vi/v_ntext.c b/usr.bin/vi/vi/v_ntext.c
index 92cff52..d4b26c5 100644
--- a/usr.bin/vi/vi/v_ntext.c
+++ b/usr.bin/vi/vi/v_ntext.c
@@ -384,7 +384,7 @@ next_ch:	tval = term_key(sp, &ikey, quoted == Q_THISCHAR ?
 			if (ch == ' ')
 				goto next_ch;
 		}
-			
+
 		/*
 		 * !!!
 		 * Historic feature.  If the first character of the input is
@@ -495,7 +495,7 @@ k_cr:			if (LF_ISSET(TXT_CR)) {
 			if (sp->s_change(sp, ep, tp->lno, LINE_RESET))
 				goto err;
 
-			/* 
+			/*
 			 * Historic practice was to delete <blank> characters
 			 * following the inserted newline.  This affected the
 			 * 'R', 'c', and 's' commands; 'c' and 's' retained
diff --git a/usr.bin/vi/vi/v_section.c b/usr.bin/vi/vi/v_section.c
index 96fb61e..a22773a 100644
--- a/usr.bin/vi/vi/v_section.c
+++ b/usr.bin/vi/vi/v_section.c
@@ -137,7 +137,7 @@ v_sectionf(sp, ep, vp)
 		/*
 		 * !!!
 		 * Historic documentation (USD:15-11, 4.2) said that formfeed
-		 * characters (^L) in the first column delimited sections.  
+		 * characters (^L) in the first column delimited sections.
 		 * The historic code mentions formfeed characters, but never
 		 * implements them.  Seems reasonable, do it.
 		 */
@@ -228,7 +228,7 @@ v_sectionb(sp, ep, vp)
 		/*
 		 * !!!
 		 * Historic documentation (USD:15-11, 4.2) said that formfeed
-		 * characters (^L) in the first column delimited sections.  
+		 * characters (^L) in the first column delimited sections.
 		 * The historic code mentions formfeed characters, but never
 		 * implements them.  Seems reasonable, do it.
 		 */
diff --git a/usr.bin/vi/vi/vcmd.h b/usr.bin/vi/vi/vcmd.h
index 4c13076..758c97b 100644
--- a/usr.bin/vi/vi/vcmd.h
+++ b/usr.bin/vi/vi/vcmd.h
@@ -146,7 +146,7 @@ typedef struct _vicmdarg {
 	 * routines set the cursor to the last character inserted; for '<',
 	 * '>' and '!', the underlying ex commands that do the operation will
 	 * set the cursor for us.   We still need a VC_C flag because there are
-	 * special motion semantics that are associated with the 'c' command. 
+	 * special motion semantics that are associated with the 'c' command.
 	 * We don't need VC_ flags for the others, because, as far as I know,
 	 * there are no special semantics associated with their motions.  So,
 	 * we group them under a single VC_ flag so that the standard motion