From c378d69e913f47df484a176998880da1125e6653 Mon Sep 17 00:00:00 2001
From: dteske <dteske@FreeBSD.org>
Date: Mon, 1 Feb 2016 00:58:07 +0000
Subject: MFC revisions 294861,294863

r294861: Add `-k' for dpv(3) `keep_tite' config option
r294863: Bump copyright

Approved by:	re (gjb)
---
 usr.bin/dpv/dpv.1 |  9 +++++++--
 usr.bin/dpv/dpv.c | 10 +++++++---
 2 files changed, 14 insertions(+), 5 deletions(-)

(limited to 'usr.bin/dpv')

diff --git a/usr.bin/dpv/dpv.1 b/usr.bin/dpv/dpv.1
index da9f776..0cf835d 100644
--- a/usr.bin/dpv/dpv.1
+++ b/usr.bin/dpv/dpv.1
@@ -1,4 +1,4 @@
-.\" Copyright (c) 2013-2015 Devin Teske
+.\" Copyright (c) 2013-2016 Devin Teske
 .\" All rights reserved.
 .\"
 .\" Redistribution and use in source and binary forms, with or without
@@ -24,7 +24,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd Oct 22, 2015
+.Dd Jan 26, 2016
 .Dt DPV 1
 .Os
 .Sh NAME
@@ -138,6 +138,11 @@ Default value
 is
 .Dq Li %'10lli bytes read @ %'9.1f bytes/sec. [%i/%i busy/wait] .
 This format is used when handling more than one file.
+.It Fl k
+Keep tite.
+Prevent visually distracting initialization/exit routines for scripts running
+.Xr dialog 1
+several times.
 .It Fl l
 Line mode. Read lines from input instead of bytes.
 .It Fl L Ar size
diff --git a/usr.bin/dpv/dpv.c b/usr.bin/dpv/dpv.c
index 4e006f6..440b5ab6 100644
--- a/usr.bin/dpv/dpv.c
+++ b/usr.bin/dpv/dpv.c
@@ -1,5 +1,5 @@
 /*-
- * Copyright (c) 2013-2014 Devin Teske <dteske@FreeBSD.org>
+ * Copyright (c) 2013-2016 Devin Teske <dteske@FreeBSD.org>
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -271,7 +271,7 @@ main(int argc, char *argv[])
 	 * Process command-line options
 	 */
 	while ((ch = getopt(argc, argv,
-	    "a:b:dDhi:I:lL:mn:No:p:P:t:TU:wx:X")) != -1) {
+	    "a:b:dDhi:I:klL:mn:No:p:P:t:TU:wx:X")) != -1) {
 		switch(ch) {
 		case 'a': /* additional message text to append */
 			if (config->aprompt == NULL) {
@@ -307,6 +307,9 @@ main(int argc, char *argv[])
 		case 'I': /* status line format string for many-files */
 			config->status_many = optarg;
 			break;
+		case 'k': /* keep tite */
+			config->keep_tite = TRUE;
+			break;
 		case 'l': /* Line mode */
 			line_mode = TRUE;
 			break;
@@ -467,7 +470,8 @@ main(int argc, char *argv[])
 	if (dpv(config, file_list) != 0 && debug)
 		warnx("dpv(3) returned error!?");
 
-	end_dialog();
+	if (!config->keep_tite)
+		end_dialog();
 	dpv_free();
 
 	exit(EXIT_SUCCESS);
-- 
cgit v1.1