Update dialog to 20120706: includes minor useability enhancements and

fixes for warnings encountered with clang.

48 files changed, 384 insertions, 1094 deletions

diff --git a/contrib/dialog/samples/copifuncs/admin.funcs b/contrib/dialog/samples/copifuncs/admin.funcs
index 27800dc..ff1b80d 100755
--- a/contrib/dialog/samples/copifuncs/admin.funcs
+++ b/contrib/dialog/samples/copifuncs/admin.funcs
@@ -1,5 +1,5 @@
-#!/bin/bash
-# $Id: admin.funcs,v 1.2 2001/01/15 22:20:11 tom Exp $
+#!/usr/bin/env bash
+# $Id: admin.funcs,v 1.3 2012/02/16 01:29:39 tom Exp $
 #
 #  ComeOn Point Functions! v0.9.2
 #  - usate da vari altri moduli ComeOn Point...
diff --git a/contrib/dialog/samples/copifuncs/common.funcs b/contrib/dialog/samples/copifuncs/common.funcs
index 04eca9a..63640c4 100755
--- a/contrib/dialog/samples/copifuncs/common.funcs
+++ b/contrib/dialog/samples/copifuncs/common.funcs
@@ -1,3 +1,5 @@
+#!/usr/bin/env bash
+# $Id: common.funcs,v 1.2 2012/06/29 22:33:42 tom Exp $
 #
 #  ComeOn Point Functions! v0.9.2
 #  - usate da vari altri moduli ComeOn Point...
diff --git a/contrib/dialog/samples/copifuncs/copi.funcs b/contrib/dialog/samples/copifuncs/copi.funcs
index 7be4bdb..87a623c 100755
--- a/contrib/dialog/samples/copifuncs/copi.funcs
+++ b/contrib/dialog/samples/copifuncs/copi.funcs
@@ -1,5 +1,5 @@
-#!/bin/bash
-# $Id: copi.funcs,v 1.3 2001/01/15 22:24:26 tom Exp $
+#!/usr/bin/env bash
+# $Id: copi.funcs,v 1.4 2012/02/16 01:29:39 tom Exp $
 #  ComeOn Point Functions! v0.9.2
 #  - usate da vari altri moduli ComeOn Point...
 #
@@ -244,7 +244,7 @@ create_innconf_newsfeeds_distrib() {
   save $INNCONF
 
   cat <<EOF >$INNCONF
-##  $Revision: 1.3 $
+##  $Revision: 1.4 $
 ##  inn.conf -- inn configuration data
 ##  Format:
 ##	<parameter>:<whitespace><value>
@@ -350,7 +350,7 @@ create_nnrpaccess() {
   save $NNRPACCESS
 
   cat <<EOF >$NNRPACCESS
-##  $Revision: 1.3 $
+##  $Revision: 1.4 $
 ##  nnrp.access - access file for on-campus NNTP sites
 ##  Format:
 ##	<host>:<perm>:<user>:<pass>:<groups>
@@ -386,7 +386,7 @@ create_hostsnntp() {
   save $HOSTSNNTP
 
   cat <<EOF >$HOSTSNNTP
-##  $Revision: 1.3 $
+##  $Revision: 1.4 $
 ##  hosts.nntp - names and addresses that feed us news
 ##  Format
 ##      <host>:
diff --git a/contrib/dialog/samples/copifuncs/copi.ifman2 b/contrib/dialog/samples/copifuncs/copi.ifman2
index 0b6dbb7..7a111bf 100755
--- a/contrib/dialog/samples/copifuncs/copi.ifman2
+++ b/contrib/dialog/samples/copifuncs/copi.ifman2
@@ -1,3 +1,6 @@
+# vile:perlmode
+# $Id: copi.ifman2,v 1.2 2012/06/29 22:33:42 tom Exp $
+
 if ( getpwuid($<) ne $ifowner ) { print "You must be owner of ifmail\n"; exit 1; }
 
 if ( (@ARGV < 3) || $ARGV[0] eq "-?" || $ARGV[0] eq "-h" ) {
diff --git a/contrib/dialog/samples/copifuncs/copi.ifpoll2 b/contrib/dialog/samples/copifuncs/copi.ifpoll2
index 216bff0..ea4deb1 100755
--- a/contrib/dialog/samples/copifuncs/copi.ifpoll2
+++ b/contrib/dialog/samples/copifuncs/copi.ifpoll2
@@ -1,3 +1,5 @@
+#!/usr/bin/env bash
+# $Id: copi.ifpoll2,v 1.2 2012/06/29 22:33:42 tom Exp $
 
 # Packets backup directory - You have to CREATE this directory
 BAK=/var/spool/ifmail/BAK
diff --git a/contrib/dialog/samples/copifuncs/copi.ifreq2 b/contrib/dialog/samples/copifuncs/copi.ifreq2
index 9ee78ff..19ff08c 100755
--- a/contrib/dialog/samples/copifuncs/copi.ifreq2
+++ b/contrib/dialog/samples/copifuncs/copi.ifreq2
@@ -1,3 +1,6 @@
+#!/usr/bin/perl
+# $Id: copi.ifreq2,v 1.2 2012/06/29 22:33:42 tom Exp $
+#
 # this is the base directory, where the req-files are stored and the
 # default outbound
 $flo_path = "/var/spool/ifmail";
diff --git a/contrib/dialog/samples/copifuncs/copi.sendifm1 b/contrib/dialog/samples/copifuncs/copi.sendifm1
index 564b9c6..dcf9c78 100755
--- a/contrib/dialog/samples/copifuncs/copi.sendifm1
+++ b/contrib/dialog/samples/copifuncs/copi.sendifm1
@@ -1,5 +1,5 @@
-#! /bin/sh
-##  $Revision: 1.1 $
+#!/usr/bin/env bash
+# $Id: copi.sendifm1,v 1.2 2012/06/29 22:33:42 tom Exp $
 ##  SH script to send UUCP batches out.
 
 ##  =()<. @<_PATH_SHELLVARS>@>()=
diff --git a/contrib/dialog/samples/copifuncs/copi.wheel b/contrib/dialog/samples/copifuncs/copi.wheel
index 567e559..ecb5061 100755
--- a/contrib/dialog/samples/copifuncs/copi.wheel
+++ b/contrib/dialog/samples/copifuncs/copi.wheel
@@ -1,5 +1,5 @@
-#!/bin/bash
-# $Id: copi.wheel,v 1.2 2001/01/15 22:26:33 tom Exp $
+#!/bin/sh
+# $Id: copi.wheel,v 1.4 2012/06/29 10:53:52 tom Exp $
 
 mkstemp size
 dialog --print-maxsize 2>$tmp_size
@@ -9,10 +9,10 @@ rm $tmp_size
 
 # Takes an integer, multiplies it for COLS, divides for 132
 scalex() {
-  echo $[$1*$COLS/132]
+  expr $1 \* $COLS / 132
 }
 scaley() {
-  echo $[$1*$ROWS/60]
+  expr $1 \* $ROWS / 60
 }
 
 dialog --backtitle "$TITLE" --no-shadow \
diff --git a/contrib/dialog/samples/copismall b/contrib/dialog/samples/copismall
index 3dfb485..537c4ac 100755
--- a/contrib/dialog/samples/copismall
+++ b/contrib/dialog/samples/copismall
@@ -1,5 +1,5 @@
-#!/bin/bash
-# $Id: copismall,v 1.8 2010/01/13 10:26:52 tom Exp $
+#!/usr/bin/env bash
+# $Id: copismall,v 1.9 2012/02/16 01:29:39 Pedro.Giffuni Exp $
 #
 #  ComeOn Point Installer! v0.9a.small (small version for cdialog v0.9a)
 #  - installa il point in modo visuale e auto-detecting. Versione light.
diff --git a/contrib/dialog/samples/debian.rc b/contrib/dialog/samples/debian.rc
index 3b42eb8..195d798 100644
--- a/contrib/dialog/samples/debian.rc
+++ b/contrib/dialog/samples/debian.rc
@@ -1,4 +1,4 @@
-# $Id: debian.rc,v 1.5 2011/01/17 00:14:53 tom Exp $
+# $Id: debian.rc,v 1.7 2011/10/15 01:00:09 tom Exp $
 # vile:confmode
 # Run-time configuration file for dialog, matches Debian color scheme.
 # (these are the default values for dialog)
@@ -47,10 +47,10 @@ border_color = (WHITE,WHITE,ON)
 button_active_color = (WHITE,BLUE,ON)
 
 # Inactive button color
-button_inactive_color = (BLACK,WHITE,OFF)
+button_inactive_color = dialog_color
 
 # Active button key color
-button_key_active_color = (WHITE,BLUE,ON)
+button_key_active_color = button_active_color
 
 # Inactive button key color
 button_key_inactive_color = (RED,WHITE,OFF)
@@ -62,64 +62,64 @@ button_label_active_color = (YELLOW,BLUE,ON)
 button_label_inactive_color = (BLACK,WHITE,ON)
 
 # Input box color
-inputbox_color = (BLACK,WHITE,OFF)
+inputbox_color = dialog_color
 
 # Input box border color
-inputbox_border_color = (BLACK,WHITE,OFF)
+inputbox_border_color = dialog_color
 
 # Search box color
-searchbox_color = (BLACK,WHITE,OFF)
+searchbox_color = dialog_color
 
 # Search box title color
-searchbox_title_color = (BLUE,WHITE,ON)
+searchbox_title_color = title_color
 
 # Search box border color
-searchbox_border_color = (WHITE,WHITE,ON)
+searchbox_border_color = border_color
 
 # File position indicator color
-position_indicator_color = (BLUE,WHITE,ON)
+position_indicator_color = title_color
 
 # Menu box color
-menubox_color = (BLACK,WHITE,OFF)
+menubox_color = dialog_color
 
 # Menu box border color
-menubox_border_color = (WHITE,WHITE,ON)
+menubox_border_color = border_color
 
 # Item color
-item_color = (BLACK,WHITE,OFF)
+item_color = dialog_color
 
 # Selected item color
-item_selected_color = (WHITE,BLUE,ON)
+item_selected_color = button_active_color
 
 # Tag color
-tag_color = (BLUE,WHITE,ON)
+tag_color = title_color
 
 # Selected tag color
-tag_selected_color = (YELLOW,BLUE,ON)
+tag_selected_color = button_label_active_color
 
 # Tag key color
-tag_key_color = (RED,WHITE,OFF)
+tag_key_color = button_key_inactive_color
 
 # Selected tag key color
 tag_key_selected_color = (RED,BLUE,ON)
 
 # Check box color
-check_color = (BLACK,WHITE,OFF)
+check_color = dialog_color
 
 # Selected check box color
-check_selected_color = (WHITE,BLUE,ON)
+check_selected_color = button_active_color
 
 # Up arrow color
 uarrow_color = (GREEN,WHITE,ON)
 
 # Down arrow color
-darrow_color = (GREEN,WHITE,ON)
+darrow_color = uarrow_color
 
 # Item help-text color
 itemhelp_color = (WHITE,BLACK,OFF)
 
 # Active form text color
-form_active_text_color = (WHITE,BLUE,ON)
+form_active_text_color = button_active_color
 
 # Form text color
 form_text_color = (WHITE,CYAN,ON)
@@ -128,4 +128,16 @@ form_text_color = (WHITE,CYAN,ON)
 form_item_readonly_color = (CYAN,WHITE,ON)
 
 # Dialog box gauge color
-gauge_color = (BLUE,WHITE,ON)
+gauge_color = title_color
+
+# Dialog box border2 color
+border2_color = dialog_color
+
+# Input box border2 color
+inputbox_border2_color = dialog_color
+
+# Search box border2 color
+searchbox_border2_color = dialog_color
+
+# Menu box border2 color
+menubox_border2_color = dialog_color
diff --git a/contrib/dialog/samples/dft-cancel b/contrib/dialog/samples/dft-cancel
new file mode 100755
index 0000000..2b317fc
--- /dev/null
+++ b/contrib/dialog/samples/dft-cancel
@@ -0,0 +1,3 @@
+#!/bin/sh
+# $Id: dft-cancel,v 1.2 2012/07/03 09:44:02 tom Exp $
+DIALOGOPTS="$DIALOGOPTS --extra-button --help-button --default-button cancel" "$@"
diff --git a/contrib/dialog/samples/dft-extra b/contrib/dialog/samples/dft-extra
new file mode 100755
index 0000000..de08cd7
--- /dev/null
+++ b/contrib/dialog/samples/dft-extra
@@ -0,0 +1,3 @@
+#!/bin/sh
+# $Id: dft-extra,v 1.2 2012/07/03 09:44:02 tom Exp $
+DIALOGOPTS="$DIALOGOPTS --extra-button --help-button --default-button extra" "$@"
diff --git a/contrib/dialog/samples/dft-help b/contrib/dialog/samples/dft-help
new file mode 100755
index 0000000..cade8a7
--- /dev/null
+++ b/contrib/dialog/samples/dft-help
@@ -0,0 +1,3 @@
+#!/bin/sh
+# $Id: dft-help,v 1.2 2012/07/03 09:44:02 tom Exp $
+DIALOGOPTS="$DIALOGOPTS --extra-button --help-button --default-button help" "$@"
diff --git a/contrib/dialog/samples/dft-no b/contrib/dialog/samples/dft-no
new file mode 100755
index 0000000..172bcb2
--- /dev/null
+++ b/contrib/dialog/samples/dft-no
@@ -0,0 +1,3 @@
+#!/bin/sh
+# $Id: dft-no,v 1.2 2012/07/03 09:44:02 tom Exp $
+DIALOGOPTS="$DIALOGOPTS --extra-button --help-button --defaultno" "$@"
diff --git a/contrib/dialog/samples/dialog.py b/contrib/dialog/samples/dialog.py
index db66fd7..5286b41 100644
--- a/contrib/dialog/samples/dialog.py
+++ b/contrib/dialog/samples/dialog.py
@@ -1,4 +1,5 @@
-# $Id: dialog.py,v 1.3 2004/09/21 00:52:15 tom Exp $
+#!/usr/bin/python
+# $Id: dialog.py,v 1.4 2012/06/29 09:33:18 tom Exp $
 # Module: dialog.py
 # Copyright (c) 2000 Robb Shecter <robb@acm.org>
 # All rights reserved.
diff --git a/contrib/dialog/samples/dselect b/contrib/dialog/samples/dselect
deleted file mode 100755
index 22995b4..0000000
--- a/contrib/dialog/samples/dselect
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/bin/sh
-# $Id: dselect,v 1.6 2010/01/13 10:20:03 tom Exp $
-
-. ./setup-vars
-
-exec 3>&1
-RESULT=`$DIALOG --title "Please choose a directory" "$@" --dselect $HOME/ 14 48 2>&1 1>&3`
-retval=$?
-exec 3>&-
-
-. ./report-string
diff --git a/contrib/dialog/samples/form1 b/contrib/dialog/samples/form1
index cfa8a4a..38e2364 100755
--- a/contrib/dialog/samples/form1
+++ b/contrib/dialog/samples/form1
@@ -1,5 +1,5 @@
 #! /bin/sh
-# $Id: form1,v 1.14 2010/01/13 10:53:11 tom Exp $
+# $Id: form1,v 1.15 2011/10/04 23:36:53 tom Exp $
 
 . ./setup-vars
 
@@ -63,8 +63,8 @@ $show" 10 40
 		echo "Button 3 (Extra) pressed."
 		exit
 		;;
-	$DIALOG_ERR)
-		echo "ERROR!"
+	$DIALOG_ERROR)
+		echo "ERROR!$value"
 		exit
 		;;
 	$DIALOG_ESC)
diff --git a/contrib/dialog/samples/fselect0 b/contrib/dialog/samples/fselect0
new file mode 100755
index 0000000..3bd5b6d
--- /dev/null
+++ b/contrib/dialog/samples/fselect0
@@ -0,0 +1,11 @@
+#!/bin/sh
+# $Id: fselect0,v 1.1 2011/10/14 08:32:48 tom Exp $
+
+. ./setup-vars
+
+exec 3>&1
+RESULT=`$DIALOG --title "Please choose a file" "$@" --fselect '' 14 48 2>&1 1>&3`
+retval=$?
+exec 3>&-
+
+. ./report-string
diff --git a/contrib/dialog/samples/inputmenu b/contrib/dialog/samples/inputmenu
index 5053cda..3c80811 100755
--- a/contrib/dialog/samples/inputmenu
+++ b/contrib/dialog/samples/inputmenu
@@ -1,60 +1,65 @@
-#! /bin/bash
-# $Id: inputmenu,v 1.10 2010/01/13 10:29:22 tom Exp $
+#! /bin/sh
+# $Id: inputmenu,v 1.15 2012/07/06 18:11:21 tom Exp $
 # 2002 - written by Tobias Rittweiler <tobrit@freebits.de>
 
 . ./setup-vars
 
-user="$USER"    ; uid="$UID"   ;
-gid="$GROUPS"  ; home="$HOME"  ;
+user="$USER"
+uid=`id|sed -e 's/^uid=//' -e 's/(.*//'`
+gid=`id|sed -e 's/^.*gid=//' -e 's/(.*//'`
+home="$HOME"
 
 while [ ${returncode:-99} -ne 1 -a ${returncode:-99} -ne 250 ]; do
-       exec 3>&1
-       value=$("$DIALOG" --clear --ok-label "Create" \
-                          --backtitle "An Example for the use of --inputmenu:" "$@" \
-                          --inputmenu "Originally I designed --inputmenu for a \
+	exec 3>&1
+	value=`$DIALOG \
+		--clear --ok-label "Create" \
+		--backtitle "An Example for the use of --inputmenu:" "$@" \
+		--inputmenu "Originally I designed --inputmenu for a \
 configuration purpose. Here is a possible piece of a configuration program. \
 " 20 50 10 \
 "Username:" "$user" \
 "UID:"      "$uid" \
 "GID:"      "$gid" \
 "HOME:"     "$home" \
-2>&1 1>&3 )
-       returncode=$?
-       exec 3>&-
-       case $returncode in
-       $DIALOG_CANCEL)
-               "$DIALOG"  --clear --backtitle "An Example for the use of --inputmenu:" \
-                               --yesno "Really quit?" 10 30
-               case $? in
-                       $DIALOG_OK) break;;
-                       $DIALOG_CANCEL) returncode=99;;
-               esac
-               ;;
-       $DIALOG_OK)
-               "$DIALOG" --clear --backtitle "An Example for the use of --inputmenu:"  \
+2>&1 1>&3 `
+	returncode=$?
+	exec 3>&-
+	case $returncode in
+	$DIALOG_CANCEL)
+		"$DIALOG" \
+			--clear --backtitle "An Example for the use of --inputmenu:" \
+			--yesno "Really quit?" 10 30
+		case $? in
+		$DIALOG_OK) break;;
+		$DIALOG_CANCEL) returncode=99;;
+		esac
+		;;
+	$DIALOG_OK)
+		"$DIALOG" \
+			--clear --backtitle "An Example for the use of --inputmenu:"  \
 			--msgbox "useradd \n\
 				-d $home \n\
 				-u $uid \n\
 				-g $gid \n\
 				$user" 10 40
-               ;;
-       $DIALOG_EXTRA)
-               value="${value:8:${#value}}"
-               tag="${value%:*}"
-               item="${value#*: }"
+		;;
+	$DIALOG_EXTRA)
+		value=`echo "$value" | sed -e 's/^RENAMED //'`
+		tag=`echo "$value" | sed -e 's/:.*//'`
+		item=`echo "$value" | sed -e 's/^[^:]*:[ 	][ 	]*//'`
 
-               case "$tag" in
-                       Username) user="$item";;
-                       UID) uid="$item";;
-                       GID) gid="$item";;
-                       HOME) home="$item";;
-               esac
-               ;;
+		case "$tag" in
+		Username) user="$item" ;;
+		UID)	  uid="$item"  ;;
+		GID)	  gid="$item"  ;;
+		HOME)	  home="$item" ;;
+		esac
+		;;
 
-       $DIALOG_ESC)
-                echo "ESC pressed."
-                break
-                ;;
+	$DIALOG_ESC)
+		echo "ESC pressed."
+		break
+		;;
 
-       esac
+	esac
 done
diff --git a/contrib/dialog/samples/inputmenu-stdout b/contrib/dialog/samples/inputmenu-stdout
index 22fce04..a778226 100755
--- a/contrib/dialog/samples/inputmenu-stdout
+++ b/contrib/dialog/samples/inputmenu-stdout
@@ -1,53 +1,63 @@
-#! /bin/bash
-# $Id: inputmenu-stdout,v 1.8 2010/01/13 10:30:14 tom Exp $
+#! /bin/sh
+# $Id: inputmenu-stdout,v 1.13 2012/07/06 18:11:12 tom Exp $
 # 2002 - written by Tobias Rittweiler <tobrit@freebits.de>
 
 . ./setup-vars
 
-user="$USER"    ; uid="$UID"   ;
-gid="$GROUPS"  ; home="$HOME"  ;
+user="$USER"
+uid=`id|sed -e 's/^uid=//' -e 's/(.*//'`
+gid=`id|sed -e 's/^.*gid=//' -e 's/(.*//'`
+home="$HOME"
 
 while [ ${returncode:-99} -ne 1 -a ${returncode:-99} -ne 250 ]; do
-       value="$("$DIALOG" --stdout --clear --ok-label "Create" \
-                          --backtitle "An Example for the use of --inputmenu:" "$@" \
-                          --inputmenu "Originally I designed --inputmenu for a \
-configuration purpose. Here is a possible piece of a configuration program.
-" 20 50 10 "Username:" "$user" "UID:" "$uid" "GID:" "$gid" "HOME:" "$home")"
-       returncode=$?
-       case $returncode in
-           $DIALOG_CANCEL)
-               "$DIALOG"  --clear --backtitle "An Example for the use of --inputmenu:" \
-                               --yesno "Really quit?" 10 30
-               case $? in
-                       $DIALOG_OK) break;;
-                       $DIALOG_CANCEL) returncode=99;;
-               esac
-               ;;
-           $DIALOG_OK)
-               "$DIALOG" --clear --backtitle "An Example for the use of --inputmenu:"  \
+	value=`$DIALOG \
+		--stdout --clear --ok-label "Create" \
+		--backtitle "An Example for the use of --inputmenu:" "$@" \
+		--inputmenu "Originally I designed --inputmenu for a \
+configuration purpose. Here is a possible piece of a configuration program. \
+" 20 50 10 \
+"Username:" "$user" \
+"UID:"      "$uid" \
+"GID:"      "$gid" \
+"HOME:"     "$home" \
+`
+	returncode=$?
+	case $returncode in
+	$DIALOG_CANCEL)
+		"$DIALOG" \
+			--clear --backtitle "An Example for the use of --inputmenu:" \
+			--yesno "Really quit?" 10 30
+		case $? in
+		$DIALOG_OK) break;;
+		$DIALOG_CANCEL) returncode=99;;
+		esac
+		;;
+	$DIALOG_OK)
+		"$DIALOG" \
+			--clear --backtitle "An Example for the use of --inputmenu:"  \
 			--msgbox "useradd \n\
 				-d $home \n\
 				-u $uid \n\
 				-g $gid \n\
 				$user" 10 40
-               ;;
-           $DIALOG_EXTRA)
-               value="${value:8:${#value}}"
-               tag="${value%:*}"
-               item="${value#*: }"
+		;;
+	$DIALOG_EXTRA)
+		value=`echo "$value" | sed -e 's/^RENAMED //'`
+		tag=`echo "$value" | sed -e 's/:.*//'`
+		item=`echo "$value" | sed -e 's/^[^:]*:[ 	][ 	]*//'`
 
-               case "$tag" in
-                       Username) user="$item";;
-                       UID) uid="$item";;
-                       GID) gid="$item";;
-                       HOME) home="$item";;
-               esac
-	       ;;
+		case "$tag" in
+		Username) user="$item" ;;
+		UID)	  uid="$item"  ;;
+		GID)	  gid="$item"  ;;
+		HOME)	  home="$item" ;;
+		esac
+		;;
 
-       $DIALOG_ESC)
-                echo "ESC pressed."
-                break
-                ;;
+	$DIALOG_ESC)
+		echo "ESC pressed."
+		break
+		;;
 
-       esac
+	esac
 done
diff --git a/contrib/dialog/samples/inputmenu1 b/contrib/dialog/samples/inputmenu1
index 4e9bae2..905c292 100755
--- a/contrib/dialog/samples/inputmenu1
+++ b/contrib/dialog/samples/inputmenu1
@@ -1,5 +1,5 @@
 #! /bin/sh
-# $Id: inputmenu1,v 1.8 2010/01/13 10:31:02 tom Exp $
+# $Id: inputmenu1,v 1.9 2012/07/01 00:59:54 tom Exp $
 #
 # "inputmenu" rewritten into Bourne shell.
 
@@ -58,7 +58,7 @@ exec 3>&-
 		;;
 	$DIALOG_EXTRA)
 		tag=`echo "$value" |sed -e 's/^RENAMED //' -e 's/:.*//'`
-		item=`echo "$value" |sed -e 's/^.*:[ ]*//' -e 's/[ ]*$//'`
+		item=`echo "$value" |sed -e 's/^[^:]*:[ ]*//' -e 's/[ ]*$//'`
 
 		case "$tag" in
 		Username)
diff --git a/contrib/dialog/samples/inputmenu2 b/contrib/dialog/samples/inputmenu2
index f560aba..ecef674 100755
--- a/contrib/dialog/samples/inputmenu2
+++ b/contrib/dialog/samples/inputmenu2
@@ -1,5 +1,5 @@
 #! /bin/sh
-# $Id: inputmenu2,v 1.8 2010/01/13 10:32:04 tom Exp $
+# $Id: inputmenu2,v 1.9 2012/07/01 01:00:34 tom Exp $
 #
 # "inputmenu1" with defaultitem, help-button.
 
@@ -66,7 +66,7 @@ exec 3>&-
 		;;
 	$DIALOG_EXTRA)
 		tag=`echo "$value" |sed -e 's/^RENAMED //' -e 's/:.*/:/'`
-		item=`echo "$value" |sed -e 's/^.*:[ ]*//' -e 's/[ ]*$//'`
+		item=`echo "$value" |sed -e 's/^[^:]*:[ ]*//' -e 's/[ ]*$//'`
 
 		case "$tag" in
 		Username:)
diff --git a/contrib/dialog/samples/inputmenu3 b/contrib/dialog/samples/inputmenu3
index e3250d8..4b9d522 100755
--- a/contrib/dialog/samples/inputmenu3
+++ b/contrib/dialog/samples/inputmenu3
@@ -1,5 +1,5 @@
 #! /bin/sh
-# $Id: inputmenu3,v 1.10 2010/01/13 10:32:51 tom Exp $
+# $Id: inputmenu3,v 1.11 2012/07/01 01:00:34 tom Exp $
 #
 # "inputmenu1" with defaultitem, help-button and item-help.
 
@@ -75,7 +75,7 @@ exec 3>&-
 		;;
 	$DIALOG_EXTRA)
 		tag=`echo "$value" |sed -e 's/^RENAMED //' -e 's/:.*/:/'`
-		item=`echo "$value" |sed -e 's/^.*:[ ]*//' -e 's/[ ]*$//'`
+		item=`echo "$value" |sed -e 's/^[^:]*:[ ]*//' -e 's/[ ]*$//'`
 
 		case "$tag" in
 		Username:)
diff --git a/contrib/dialog/samples/inputmenu4 b/contrib/dialog/samples/inputmenu4
index a872527..6688c9c 100755
--- a/contrib/dialog/samples/inputmenu4
+++ b/contrib/dialog/samples/inputmenu4
@@ -1,5 +1,5 @@
 #! /bin/sh
-# $Id: inputmenu4,v 1.8 2010/01/13 10:33:35 tom Exp $
+# $Id: inputmenu4,v 1.9 2012/07/01 01:00:34 tom Exp $
 #
 # "inputmenu1" with a different label for the extra-button
 
@@ -59,7 +59,7 @@ exec 3>&-
 		;;
 	$DIALOG_EXTRA)
 		tag=`echo "$value" |sed -e 's/^RENAMED //' -e 's/:.*//'`
-		item=`echo "$value" |sed -e 's/^.*:[ ]*//' -e 's/[ ]*$//'`
+		item=`echo "$value" |sed -e 's/^[^:]*:[ ]*//' -e 's/[ ]*$//'`
 
 		case "$tag" in
 		Username)
diff --git a/contrib/dialog/samples/killall b/contrib/dialog/samples/killall
index 9d233f0..7030fe2 100755
--- a/contrib/dialog/samples/killall
+++ b/contrib/dialog/samples/killall
@@ -1,13 +1,16 @@
 #! /bin/sh
-# $Id: killall,v 1.2 2004/09/17 19:56:18 tom Exp $
+# $Id: killall,v 1.3 2012/06/29 09:39:19 tom Exp $
 # Linux has a program that does this correctly.
+
+. ./setup-vars
+
 for prog in $*
 do
 	pid=`ps -a |fgrep $prog |fgrep -v fgrep|sed -e 's/^[ ]*//' -e 's/ .*//' `
 	if test -n "$pid" ; then
 		echo killing pid=$pid, $prog
-		kill -1 $pid || \
-		kill -15 $pid || \
-		kill -9 $pid
+		kill -$SIG_HUP $pid || \
+		kill -$SIG_TERM $pid || \
+		kill -$SIG_KILL $pid
 	fi
 done
diff --git a/contrib/dialog/samples/prgbox b/contrib/dialog/samples/prgbox
index 9170a36..c06a630 100755
--- a/contrib/dialog/samples/prgbox
+++ b/contrib/dialog/samples/prgbox
@@ -1,6 +1,9 @@
 #!/bin/sh
-# $Id: prgbox,v 1.1 2011/03/02 00:10:54 tom Exp $
+# $Id: prgbox,v 1.2 2012/07/02 09:46:24 tom Exp $
 
 . ./setup-vars
 
 $DIALOG --title "PRGBOX" "$@" --prgbox "./shortlist" 20 70
+
+retval=$?
+. ./report-button
diff --git a/contrib/dialog/samples/prgbox2 b/contrib/dialog/samples/prgbox2
index 53f3daa..ba94622 100755
--- a/contrib/dialog/samples/prgbox2
+++ b/contrib/dialog/samples/prgbox2
@@ -1,6 +1,9 @@
 #!/bin/sh
-# $Id: prgbox2,v 1.1 2011/03/02 01:25:54 tom Exp $
+# $Id: prgbox2,v 1.2 2012/07/02 09:46:24 tom Exp $
 
 . ./setup-vars
 
 $DIALOG --title "PRGBOX" "$@" --prgbox "./shortlist 3" 20 70
+
+retval=$?
+. ./report-button
diff --git a/contrib/dialog/samples/report-button b/contrib/dialog/samples/report-button
index e13b03a..c6a1730 100644
--- a/contrib/dialog/samples/report-button
+++ b/contrib/dialog/samples/report-button
@@ -1,4 +1,5 @@
-# $Id: report-button,v 1.2 2010/01/13 09:59:14 tom Exp $
+#!/bin/sh
+# $Id: report-button,v 1.3 2012/06/29 09:29:36 tom Exp $
 # Report button-only, no $RESULT
 # vile:shmode
 
diff --git a/contrib/dialog/samples/report-edit b/contrib/dialog/samples/report-edit
index f17b6d3..37e3eb0 100644
--- a/contrib/dialog/samples/report-edit
+++ b/contrib/dialog/samples/report-edit
@@ -1,4 +1,5 @@
-# $Id: report-edit,v 1.3 2010/01/13 09:59:43 tom Exp $
+#!/bin/sh
+# $Id: report-edit,v 1.4 2012/06/29 09:29:41 tom Exp $
 # Report results from editing.
 # vile:shmode
 
diff --git a/contrib/dialog/samples/report-string b/contrib/dialog/samples/report-string
index a674517..dc96c2f 100644
--- a/contrib/dialog/samples/report-string
+++ b/contrib/dialog/samples/report-string
@@ -1,4 +1,5 @@
-# $Id: report-string,v 1.2 2010/01/13 10:00:11 tom Exp $
+#!/bin/sh
+# $Id: report-string,v 1.3 2012/06/29 09:32:17 tom Exp $
 # Report result passed in a string $RESULT
 # vile:shmode
 
diff --git a/contrib/dialog/samples/report-tempfile b/contrib/dialog/samples/report-tempfile
index 5a88d44..32c04e0 100644
--- a/contrib/dialog/samples/report-tempfile
+++ b/contrib/dialog/samples/report-tempfile
@@ -1,4 +1,5 @@
-# $Id: report-tempfile,v 1.3 2010/01/13 09:59:05 tom Exp $
+#!/bin/sh
+# $Id: report-tempfile,v 1.4 2012/06/29 09:29:47 tom Exp $
 # Report results in a temporary-file.
 # vile:shmode
 
diff --git a/contrib/dialog/samples/report-yesno b/contrib/dialog/samples/report-yesno
index 81da89b..d22ebe4 100644
--- a/contrib/dialog/samples/report-yesno
+++ b/contrib/dialog/samples/report-yesno
@@ -1,4 +1,5 @@
-# $Id: report-yesno,v 1.1 2010/01/13 10:40:14 tom Exp $
+#!/bin/sh
+# $Id: report-yesno,v 1.2 2012/06/29 09:32:12 tom Exp $
 # Report button-only, no $RESULT
 # vile:shmode
 
diff --git a/contrib/dialog/samples/setup-edit b/contrib/dialog/samples/setup-edit
index df86297..8f9d284 100644
--- a/contrib/dialog/samples/setup-edit
+++ b/contrib/dialog/samples/setup-edit
@@ -1,6 +1,7 @@
-# $Id: setup-edit,v 1.1 2010/01/13 01:56:07 tom Exp $
+#!/bin/sh
+# $Id: setup-edit,v 1.2 2012/06/29 09:31:49 tom Exp $
 # vile:shmode
 
 input=`tempfile 2>/dev/null` || input=/tmp/input$$
 output=`tempfile 2>/dev/null` || output=/tmp/test$$
-trap "rm -f $input $output" 0 1 2 5 15
+trap "rm -f $input $output" $SIG_NONE $SIG_HUP $SIG_INT $SIG_TRAP $SIG_TERM
diff --git a/contrib/dialog/samples/setup-tempfile b/contrib/dialog/samples/setup-tempfile
index 6db551f..3a67ea6 100644
--- a/contrib/dialog/samples/setup-tempfile
+++ b/contrib/dialog/samples/setup-tempfile
@@ -1,5 +1,6 @@
-# $Id: setup-tempfile,v 1.1 2010/01/13 01:41:02 tom Exp $
+#!/bin/sh
+# $Id: setup-tempfile,v 1.3 2012/07/06 17:51:56 tom Exp $
 # vile:shmode
 
-tempfile=`tempfile 2>/dev/null` || tempfile=/tmp/test$$
-trap "rm -f $tempfile" 0 1 2 5 15
+tempfile=`(tempfile) 2>/dev/null` || tempfile=/tmp/test$$
+trap "rm -f $tempfile" 0 $SIG_NONE $SIG_HUP $SIG_INT $SIG_TRAP $SIG_TERM
diff --git a/contrib/dialog/samples/setup-utf8 b/contrib/dialog/samples/setup-utf8
index 2fd70d4..07cff39 100644
--- a/contrib/dialog/samples/setup-utf8
+++ b/contrib/dialog/samples/setup-utf8
@@ -1,4 +1,5 @@
-# $Id: setup-utf8,v 1.1 2010/01/13 01:51:44 tom Exp $
+#!/bin/sh
+# $Id: setup-utf8,v 1.2 2012/06/29 09:50:32 tom Exp $
 # vile:shmode
 
 case none"$LANG$LC_ALL$LC_CTYPE" in
diff --git a/contrib/dialog/samples/setup-vars b/contrib/dialog/samples/setup-vars
index ae5e725..f0ea779 100644
--- a/contrib/dialog/samples/setup-vars
+++ b/contrib/dialog/samples/setup-vars
@@ -1,4 +1,5 @@
-# $Id: setup-vars,v 1.2 2011/01/04 00:21:43 tom Exp $
+#!/bin/sh
+# $Id: setup-vars,v 1.3 2012/06/29 09:52:26 tom Exp $
 # vile:shmode
 
 # These symbols are defined to use in the sample shell scripts to make them
@@ -13,3 +14,10 @@
 : ${DIALOG_EXTRA=3}
 : ${DIALOG_ITEM_HELP=4}
 : ${DIALOG_ESC=255}
+
+: ${SIG_NONE=0}
+: ${SIG_HUP=1}
+: ${SIG_INT=2}
+: ${SIG_QUIT=3}
+: ${SIG_KILL=9}
+: ${SIG_TERM=15}
diff --git a/contrib/dialog/samples/slackware.rc b/contrib/dialog/samples/slackware.rc
index 967147e..f12d27b 100644
--- a/contrib/dialog/samples/slackware.rc
+++ b/contrib/dialog/samples/slackware.rc
@@ -1,4 +1,4 @@
-# $Id: slackware.rc,v 1.7 2011/01/17 00:14:41 tom Exp $
+# $Id: slackware.rc,v 1.9 2011/10/15 01:00:25 tom Exp $
 # vile:confmode
 # Run-time configuration file for dialog, matches Slackware color scheme.
 #
@@ -46,16 +46,16 @@ border_color = (CYAN,CYAN,ON)
 button_active_color = (WHITE,BLUE,ON)
 
 # Inactive button color
-button_inactive_color = (BLACK,CYAN,OFF)
+button_inactive_color = dialog_color
 
 # Active button key color
-button_key_active_color = (WHITE,BLUE,ON)
+button_key_active_color = button_active_color
 
 # Inactive button key color
 button_key_inactive_color = (RED,CYAN,OFF)
 
 # Active button label color
-button_label_active_color = (WHITE,BLUE,ON)
+button_label_active_color = button_active_color
 
 # Inactive button label color
 button_label_inactive_color = (BLACK,CYAN,ON)
@@ -64,47 +64,46 @@ button_label_inactive_color = (BLACK,CYAN,ON)
 inputbox_color = (BLUE,WHITE,OFF)
 
 # Input box border color
-inputbox_border_color = (CYAN,CYAN,ON)
+inputbox_border_color = border_color
 
 # Search box color
 searchbox_color = (YELLOW,WHITE,ON)
 
 # Search box title color
-# FIXME
 searchbox_title_color = (WHITE,WHITE,ON)
 
 # Search box border color
 searchbox_border_color = (RED,WHITE,OFF)
 
 # File position indicator color
-position_indicator_color = (RED,CYAN,OFF)
+position_indicator_color = button_key_inactive_color
 
 # Menu box color
-menubox_color = (BLACK,CYAN,OFF)
+menubox_color = dialog_color
 
 # Menu box border color
-menubox_border_color = (CYAN,CYAN,ON)
+menubox_border_color = border_color
 
 # Item color
-item_color = (BLACK,CYAN,OFF)
+item_color = dialog_color
 
 # Selected item color
-item_selected_color = (WHITE,BLUE,OFF)
+item_selected_color = screen_color
 
 # Tag color
-tag_color = (YELLOW,CYAN,ON)
+tag_color = title_color
 
 # Selected tag color
-tag_selected_color = (WHITE,BLUE,OFF)
+tag_selected_color = screen_color
 
 # Tag key color
-tag_key_color = (RED,CYAN,OFF)
+tag_key_color = button_key_inactive_color
 
 # Selected tag key color
 tag_key_selected_color = (RED,BLUE,ON)
 
 # Check box color
-check_color = (BLACK,CYAN,OFF)
+check_color = dialog_color
 
 # Selected check box color
 check_selected_color = (WHITE,CYAN,ON)
@@ -113,13 +112,13 @@ check_selected_color = (WHITE,CYAN,ON)
 uarrow_color = (GREEN,CYAN,ON)
 
 # Down arrow color
-darrow_color = (GREEN,CYAN,ON)
+darrow_color = uarrow_color
 
 # Item help-text color
-itemhelp_color = (WHITE,BLACK,OFF)
+itemhelp_color = shadow_color
 
 # Active form text color
-form_active_text_color = (BLUE,WHITE,OFF)
+form_active_text_color = inputbox_color
 
 # Form text color
 form_text_color = (CYAN,BLUE,ON)
@@ -129,3 +128,15 @@ form_item_readonly_color = (CYAN,WHITE,ON)
 
 # Dialog box gauge color
 gauge_color = (BLUE,WHITE,ON)
+
+# Dialog box border2 color
+border2_color = (BLACK,WHITE,OFF)
+
+# Input box border2 color
+inputbox_border2_color = border2_color
+
+# Search box border2 color
+searchbox_border2_color = border2_color
+
+# Menu box border2 color
+menubox_border2_color = border2_color
diff --git a/contrib/dialog/samples/sourcemage.rc b/contrib/dialog/samples/sourcemage.rc
index 1ba826f..9384798 100644
--- a/contrib/dialog/samples/sourcemage.rc
+++ b/contrib/dialog/samples/sourcemage.rc
@@ -1,4 +1,4 @@
-# $Id: sourcemage.rc,v 1.4 2011/01/17 00:14:25 tom Exp $
+# $Id: sourcemage.rc,v 1.6 2011/10/15 01:00:41 tom Exp $
 # vile:confmode
 # Run-time configuration file for dialog, matches SourceMage color scheme.
 #
@@ -46,10 +46,10 @@ border_color = (WHITE,WHITE,ON)
 button_active_color = (WHITE,RED,ON)
 
 # Inactive button color
-button_inactive_color = (BLACK,WHITE,OFF)
+button_inactive_color = dialog_color
 
 # Active button key color
-button_key_active_color = (WHITE,RED,ON)
+button_key_active_color = button_active_color
 
 # Inactive button key color
 button_key_inactive_color = (RED,WHITE,OFF)
@@ -61,70 +61,82 @@ button_label_active_color = (RED,RED,ON)
 button_label_inactive_color = (BLACK,WHITE,ON)
 
 # Input box color
-inputbox_color = (BLACK,WHITE,OFF)
+inputbox_color = dialog_color
 
 # Input box border color
-inputbox_border_color = (BLACK,WHITE,OFF)
+inputbox_border_color = dialog_color
 
 # Search box color
-searchbox_color = (BLACK,WHITE,OFF)
+searchbox_color = dialog_color
 
 # Search box title color
-searchbox_title_color = (RED,WHITE,ON)
+searchbox_title_color = title_color
 
 # Search box border color
-searchbox_border_color = (WHITE,WHITE,ON)
+searchbox_border_color = border_color
 
 # File position indicator color
-position_indicator_color = (RED,WHITE,ON)
+position_indicator_color = title_color
 
 # Menu box color
-menubox_color = (BLACK,WHITE,OFF)
+menubox_color = dialog_color
 
 # Menu box border color
-menubox_border_color = (WHITE,WHITE,ON)
+menubox_border_color = border_color
 
 # Item color
-item_color = (BLACK,WHITE,OFF)
+item_color = dialog_color
 
 # Selected item color
-item_selected_color = (WHITE,RED,ON)
+item_selected_color = button_active_color
 
 # Tag color
-tag_color = (RED,WHITE,ON)
+tag_color = title_color
 
 # Selected tag color
-tag_selected_color = (RED,RED,ON)
+tag_selected_color = button_label_active_color
 
 # Tag key color
-tag_key_color = (RED,WHITE,ON)
+tag_key_color = title_color
 
 # Selected tag key color
-tag_key_selected_color = (WHITE,RED,ON)
+tag_key_selected_color = button_active_color
 
 # Check box color
-check_color = (BLACK,WHITE,OFF)
+check_color = dialog_color
 
 # Selected check box color
-check_selected_color = (WHITE,RED,ON)
+check_selected_color = button_active_color
 
 # Up arrow color
-uarrow_color = (RED,WHITE,ON)
+uarrow_color = title_color
 
 # Down arrow color
-darrow_color = (RED,WHITE,ON)
+darrow_color = title_color
 
 # Item help-text color
 itemhelp_color = (WHITE,BLACK,OFF)
 
 # Active form text color
-form_active_text_color = (BLACK,WHITE,OFF)
+form_active_text_color = dialog_color
 
 # Form text color
-form_text_color = (RED,BLACK,ON)
+form_text_color = screen_color
 
 # Readonly form item color
 form_item_readonly_color = (CYAN,WHITE,ON)
 
 # Dialog box gauge color
 gauge_color = (BLUE,WHITE,ON)
+
+# Dialog box border2 color
+border2_color = dialog_color
+
+# Input box border2 color
+inputbox_border2_color = dialog_color
+
+# Search box border2 color
+searchbox_border2_color = dialog_color
+
+# Menu box border2 color
+menubox_border2_color = dialog_color
diff --git a/contrib/dialog/samples/suse.rc b/contrib/dialog/samples/suse.rc
index f2417b2..c8ff099 100644
--- a/contrib/dialog/samples/suse.rc
+++ b/contrib/dialog/samples/suse.rc
@@ -1,4 +1,4 @@
-# $Id: suse.rc,v 1.3 2011/01/17 00:15:27 tom Exp $
+# $Id: suse.rc,v 1.5 2011/10/15 01:01:00 tom Exp $
 # vile:confmode
 # Run-time configuration file for dialog, matches SuSE color scheme.
 #
@@ -46,10 +46,10 @@ border_color = (WHITE,WHITE,ON)
 button_active_color = (WHITE,BLUE,ON)
 
 # Inactive button color
-button_inactive_color = (BLACK,WHITE,OFF)
+button_inactive_color = dialog_color
 
 # Active button key color
-button_key_active_color = (WHITE,BLUE,ON)
+button_key_active_color = button_active_color
 
 # Inactive button key color
 button_key_inactive_color = (RED,WHITE,OFF)
@@ -61,64 +61,64 @@ button_label_active_color = (YELLOW,BLUE,ON)
 button_label_inactive_color = (BLACK,WHITE,ON)
 
 # Input box color
-inputbox_color = (BLACK,WHITE,OFF)
+inputbox_color = dialog_color
 
 # Input box border color
-inputbox_border_color = (BLACK,WHITE,OFF)
+inputbox_border_color = dialog_color
 
 # Search box color
-searchbox_color = (BLACK,WHITE,OFF)
+searchbox_color = dialog_color
 
 # Search box title color
-searchbox_title_color = (YELLOW,WHITE,ON)
+searchbox_title_color = title_color
 
 # Search box border color
-searchbox_border_color = (WHITE,WHITE,ON)
+searchbox_border_color = border_color
 
 # File position indicator color
-position_indicator_color = (YELLOW,WHITE,ON)
+position_indicator_color = title_color
 
 # Menu box color
-menubox_color = (BLACK,WHITE,OFF)
+menubox_color = dialog_color
 
 # Menu box border color
-menubox_border_color = (WHITE,WHITE,ON)
+menubox_border_color = border_color
 
 # Item color
-item_color = (BLACK,WHITE,OFF)
+item_color = dialog_color
 
 # Selected item color
-item_selected_color = (WHITE,BLUE,ON)
+item_selected_color = button_active_color
 
 # Tag color
-tag_color = (YELLOW,WHITE,ON)
+tag_color = title_color
 
 # Selected tag color
-tag_selected_color = (YELLOW,BLUE,ON)
+tag_selected_color = button_label_active_color
 
 # Tag key color
-tag_key_color = (RED,WHITE,OFF)
+tag_key_color = button_key_inactive_color
 
 # Selected tag key color
 tag_key_selected_color = (RED,BLUE,ON)
 
 # Check box color
-check_color = (BLACK,WHITE,OFF)
+check_color = dialog_color
 
 # Selected check box color
-check_selected_color = (WHITE,BLUE,ON)
+check_selected_color = button_active_color
 
 # Up arrow color
 uarrow_color = (GREEN,WHITE,ON)
 
 # Down arrow color
-darrow_color = (GREEN,WHITE,ON)
+darrow_color = uarrow_color
 
 # Item help-text color
 itemhelp_color = (WHITE,BLACK,OFF)
 
 # Active form text color
-form_active_text_color = (WHITE,BLUE,ON)
+form_active_text_color = button_active_color
 
 # Form text color
 form_text_color = (WHITE,CYAN,ON)
@@ -128,3 +128,15 @@ form_item_readonly_color = (CYAN,WHITE,ON)
 
 # Dialog box gauge color
 gauge_color = (BLUE,WHITE,ON)
+
+# Dialog box border2 color
+border2_color = dialog_color
+
+# Input box border2 color
+inputbox_border2_color = dialog_color
+
+# Search box border2 color
+searchbox_border2_color = dialog_color
+
+# Menu box border2 color
+menubox_border2_color = dialog_color
diff --git a/contrib/dialog/samples/tailboxbg b/contrib/dialog/samples/tailboxbg
index 957d774..bcc3434 100755
--- a/contrib/dialog/samples/tailboxbg
+++ b/contrib/dialog/samples/tailboxbg
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $Id: tailboxbg,v 1.9 2010/01/13 10:20:03 tom Exp $
+# $Id: tailboxbg,v 1.10 2012/06/29 09:48:28 tom Exp $
 
 . ./setup-vars
 
@@ -16,7 +16,7 @@ $DIALOG --title "TAIL BOX" \
 sleep 10
 
 # now kill it
-kill -3 `cat $tempfile` 2>&1 >/dev/null 2>/dev/null
+kill -$SIG_QUIT `cat $tempfile` 2>&1 >/dev/null 2>/dev/null
 
 # ...and the process that is making the listing
 ./killall listing
diff --git a/contrib/dialog/samples/tailboxbg1 b/contrib/dialog/samples/tailboxbg1
index 2955ad0..f04567a 100755
--- a/contrib/dialog/samples/tailboxbg1
+++ b/contrib/dialog/samples/tailboxbg1
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $Id: tailboxbg1,v 1.9 2010/01/13 10:20:03 tom Exp $
+# $Id: tailboxbg1,v 1.10 2012/06/29 09:51:46 tom Exp $
 
 . ./setup-vars
 
@@ -24,7 +24,7 @@ if test -n "$pid" ; then
 sleep 10
 
 # now kill it
-kill -3 $pid 2>&1 >/dev/null 2>/dev/null
+kill -$SIG_QUIT $pid 2>&1 >/dev/null 2>/dev/null
 echo "killed [$pid]"
 fi
 
diff --git a/contrib/dialog/samples/tailboxbg2 b/contrib/dialog/samples/tailboxbg2
index 0617708..628cb05 100755
--- a/contrib/dialog/samples/tailboxbg2
+++ b/contrib/dialog/samples/tailboxbg2
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $Id: tailboxbg2,v 1.9 2010/01/13 10:20:03 tom Exp $
+# $Id: tailboxbg2,v 1.10 2012/06/29 09:51:11 tom Exp $
 
 . ./setup-vars
 
@@ -25,7 +25,7 @@ if test -n "$pid" ; then
 sleep 10
 
 # now kill it
-kill -3 $pid 2>&1 >/dev/null 2>/dev/null
+kill -$SIG_QUIT $pid 2>&1 >/dev/null 2>/dev/null
 echo "killed [$pid]"
 fi
 
diff --git a/contrib/dialog/samples/testdata-8bit b/contrib/dialog/samples/testdata-8bit
index 7810f9e..f09021d 100755
--- a/contrib/dialog/samples/testdata-8bit
+++ b/contrib/dialog/samples/testdata-8bit
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $Id: testdata-8bit,v 1.1 2004/12/19 16:19:12 tom Exp $
+# $Id: testdata-8bit,v 1.2 2011/10/16 23:26:32 tom Exp $
 
 # Select one of the "SAMPLE=" lines, to test handling of characters which
 # are nonprinting in a POSIX locale:
@@ -37,3 +37,12 @@ case .$1 in
 	SAMPLE="
"
 	;;
 esac
+
+# This script is source'd from other scripts, and uses the parameter list from
+# those explicitly.  But they may use the parameter list later, to set options
+# specially for dialog.  Work around the conflicting uses by removing the
+# parameter which we just used to select a set of data.
+if test $# != 0
+then
+	shift 1
+fi
diff --git a/contrib/dialog/samples/valgrind.log b/contrib/dialog/samples/valgrind.log
deleted file mode 100644
index f33b862..0000000
--- a/contrib/dialog/samples/valgrind.log
+++ /dev/null
@@ -1,847 +0,0 @@
-==23273== Memcheck, a memory error detector.
-==23273== Copyright (C) 2002-2007, and GNU GPL'd, by Julian Seward et al.
-==23273== Using LibVEX rev 1854, a library for dynamic binary translation.
-==23273== Copyright (C) 2004-2007, and GNU GPL'd, by OpenWorks LLP.
-==23273== Using valgrind-3.3.1-Debian, a dynamic binary instrumentation framework.
-==23273== Copyright (C) 2000-2007, and GNU GPL'd, by Julian Seward et al.
-==23273== 
---23273-- Command line
---23273--    /usr/build/dialog/dialog-1.1-20110707/dialog
---23273--    --title
---23273--    YES/NO BOX
---23273--    --clear
---23273--    --yesno
---23273--    Hi, this is a yes/no dialog box. You can use this to ask                  questions that have an answer of either yes or no.                  BTW, do you notice that long lines will be automatically                  wrapped around so that they can fit in the box? You can                  also control line breaking explicitly by inserting                  'backslash n' at any place you like, but in this case,                  auto wrap around will be disabled and you will have to                  control line breaking yourself.
---23273--    15
---23273--    61
---23273-- Startup, with flags:
---23273--    --suppressions=/usr/lib/valgrind/debian-libc6-dbg.supp
---23273--    -v
---23273--    --num-callers=10
---23273--    --error-limit=no
---23273--    --show-reachable=yes
---23273--    --leak-resolution=high
---23273--    --leak-check=yes
---23273--    --show-reachable=yes
---23273--    --log-fd=2
---23273-- Contents of /proc/version:
---23273--   Linux version 2.6.26-2-686 (Debian 2.6.26-26lenny3) (dannf@debian.org) (gcc version 4.1.3 20080704 (prerelease) (Debian 4.1.2-25)) #1 SMP Sat Jun 11 14:54:10 UTC 2011
---23273-- Arch and hwcaps: X86, x86-sse1-sse2
---23273-- Page sizes: currently 4096, max supported 4096
---23273-- Valgrind library directory: /usr/lib/valgrind
---23273-- Reading syms from /lib/ld-2.7.so (0x4000000)
---23273-- Reading debug info from /lib/ld-2.7.so...
---23273-- ... CRC mismatch (computed 0f4d8d49 wanted a869dbba)
---23273-- Reading debug info from /usr/lib/debug/lib/ld-2.7.so...
---23273-- Reading syms from /usr/build/dialog/dialog-1.1-20110707/dialog (0x8048000)
---23273-- Reading syms from /usr/lib/valgrind/x86-linux/memcheck (0x38000000)
---23273--    object doesn't have a dynamic symbol table
---23273-- Reading suppressions file: /usr/lib/valgrind/debian-libc6-dbg.supp
---23273-- Reading suppressions file: /usr/lib/valgrind/default.supp
---23273-- REDIR: 0x4015500 (index) redirected to 0x3802cf43 (vgPlain_x86_linux_REDIR_FOR_index)
---23273-- Reading syms from /usr/lib/valgrind/x86-linux/vgpreload_core.so (0x401E000)
---23273-- Reading syms from /usr/lib/valgrind/x86-linux/vgpreload_memcheck.so (0x4020000)
-==23273== WARNING: new redirection conflicts with existing -- ignoring it
---23273--     new: 0x04015500 (index               ) R-> 0x040241e0 index
---23273-- REDIR: 0x40156f0 (strlen) redirected to 0x4024490 (strlen)
---23273-- Reading syms from /usr/lib/debug/libm-2.7.so (0x4027000)
---23273-- Reading syms from /usr/lib/debug/libc-2.7.so (0x404D000)
---23273-- REDIR: 0x40beaf0 (rindex) redirected to 0x40240c0 (rindex)
---23273-- REDIR: 0x40bf760 (memset) redirected to 0x4025380 (memset)
---23273-- REDIR: 0x40be160 (strcmp) redirected to 0x4024770 (strcmp)
---23273-- REDIR: 0x40be700 (strlen) redirected to 0x4024470 (strlen)
---23273-- REDIR: 0x40be910 (strncmp) redirected to 0x40246e0 (strncmp)
---23273-- REDIR: 0x40bdff0 (index) redirected to 0x40241b0 (index)
---23273-- REDIR: 0x40b9740 (free) redirected to 0x4022ad0 (free)
---23273-- REDIR: 0x40bb2c0 (calloc) redirected to 0x4021d60 (calloc)
---23273-- REDIR: 0x40c07e0 (strchrnul) redirected to 0x4025450 (strchrnul)
---23273-- REDIR: 0x40bb5e0 (malloc) redirected to 0x4023cb0 (malloc)
---23273-- REDIR: 0x40bfc80 (memcpy) redirected to 0x40248e0 (memcpy)
---23273-- REDIR: 0x40be7b0 (strnlen) redirected to 0x4024430 (strnlen)
---23273-- REDIR: 0x40bf7c0 (mempcpy) redirected to 0x40254b0 (mempcpy)
---23273-- REDIR: 0x40be1f0 (strcpy) redirected to 0x40244d0 (strcpy)
---23273-- REDIR: 0x40bba60 (realloc) redirected to 0x4023dc0 (realloc)
---23273-- REDIR: 0x40bea20 (strncpy) redirected to 0x40245a0 (strncpy)
---23273-- REDIR: 0x40bf690 (bcmp) redirected to 0x4025070 (bcmp)
---23273-- REDIR: 0x40bde40 (strcat) redirected to 0x4024240 (strcat)
-==23273== 
-==23273== ERROR SUMMARY: 0 errors from 0 contexts (suppressed: 14 from 1)
---23273-- 
---23273-- supp:     14 dl-hack3-cond-1
-==23273== malloc/free: in use at exit: 72,482 bytes in 382 blocks.
-==23273== malloc/free: 419 allocs, 37 frees, 79,695 bytes allocated.
-==23273== 
-==23273== searching for pointers to 382 not-freed blocks.
-==23273== checked 149,580 bytes.
-==23273== 
-==23273== 6 bytes in 1 blocks are still reachable in loss record 1 of 62
-==23273==    at 0x4023D6E: malloc (vg_replace_malloc.c:207)
-==23273==    by 0x8068E64: dlg_strclone (util.c:1740)
-==23273==    by 0x805FE72: same_cache2 (inputstr.c:212)
-==23273==    by 0x805FEE7: dlg_index_wchars (inputstr.c:342)
-==23273==    by 0x8059BBE: print_button (buttons.c:97)
-==23273==    by 0x805A265: dlg_draw_buttons (buttons.c:297)
-==23273==    by 0x806A2D0: dialog_yesno (yesno.c:98)
-==23273==    by 0x804A728: call_yesno (dialog.c:600)
-==23273==    by 0x804CC56: main (dialog.c:1679)
-==23273== 
-==23273== 
-==23273== 6 bytes in 1 blocks are still reachable in loss record 2 of 62
-==23273==    at 0x4023D6E: malloc (vg_replace_malloc.c:207)
-==23273==    by 0x8068E64: dlg_strclone (util.c:1740)
-==23273==    by 0x805FE72: same_cache2 (inputstr.c:212)
-==23273==    by 0x805FFCE: dlg_index_columns (inputstr.c:397)
-==23273==    by 0x8060166: dlg_count_columns (inputstr.c:473)
-==23273==    by 0x805A1F3: dlg_draw_buttons (buttons.c:296)
-==23273==    by 0x806A2D0: dialog_yesno (yesno.c:98)
-==23273==    by 0x804A728: call_yesno (dialog.c:600)
-==23273==    by 0x804CC56: main (dialog.c:1679)
-==23273== 
-==23273== 
-==23273== 7 bytes in 2 blocks are still reachable in loss record 3 of 62
-==23273==    at 0x4023D6E: malloc (vg_replace_malloc.c:207)
-==23273==    by 0x8068E64: dlg_strclone (util.c:1740)
-==23273==    by 0x805FE72: same_cache2 (inputstr.c:212)
-==23273==    by 0x805FFCE: dlg_index_columns (inputstr.c:397)
-==23273==    by 0x8060166: dlg_count_columns (inputstr.c:473)
-==23273==    by 0x8059E3A: dlg_button_sizes (buttons.c:179)
-==23273==    by 0x8059F04: dlg_button_x_step (buttons.c:209)
-==23273==    by 0x805A02F: dlg_button_layout (buttons.c:234)
-==23273==    by 0x806A11F: dialog_yesno (yesno.c:71)
-==23273==    by 0x804A728: call_yesno (dialog.c:600)
-==23273== 
-==23273== 
-==23273== 11 bytes in 1 blocks are still reachable in loss record 4 of 62
-==23273==    at 0x4023D6E: malloc (vg_replace_malloc.c:207)
-==23273==    by 0x8068E64: dlg_strclone (util.c:1740)
-==23273==    by 0x805FE72: same_cache2 (inputstr.c:212)
-==23273==    by 0x805FFCE: dlg_index_columns (inputstr.c:397)
-==23273==    by 0x8060166: dlg_count_columns (inputstr.c:473)
-==23273==    by 0x8067711: real_auto_size (util.c:1101)
-==23273==    by 0x8067A1F: dlg_auto_size (util.c:1167)
-==23273==    by 0x806A14E: dialog_yesno (yesno.c:72)
-==23273==    by 0x804A728: call_yesno (dialog.c:600)
-==23273==    by 0x804CC56: main (dialog.c:1679)
-==23273== 
-==23273== 
-==23273== 12 bytes in 1 blocks are still reachable in loss record 5 of 62
-==23273==    at 0x4021E22: calloc (vg_replace_malloc.c:397)
-==23273==    by 0x807F18F: _nc_add_to_try (add_tries.c:90)
-==23273==    by 0x80885C6: _nc_init_keytry (init_keytry.c:74)
-==23273==    by 0x80807F4: _nc_keypad (lib_options.c:262)
-==23273==    by 0x808035F: keypad (lib_options.c:129)
-==23273==    by 0x8066340: init_dialog (util.c:330)
-==23273==    by 0x804C880: main (dialog.c:1604)
-==23273== 
-==23273== 
-==23273== 16 bytes in 1 blocks are still reachable in loss record 6 of 62
-==23273==    at 0x4023D6E: malloc (vg_replace_malloc.c:207)
-==23273==    by 0x41165D0: tsearch (tsearch.c:281)
-==23273==    by 0x805FC92: make_cache (inputstr.c:149)
-==23273==    by 0x805FCF7: load_cache (inputstr.c:161)
-==23273==    by 0x805FFB4: dlg_index_columns (inputstr.c:396)
-==23273==    by 0x8060166: dlg_count_columns (inputstr.c:473)
-==23273==    by 0x8066FD3: dlg_print_scrolled (util.c:886)
-==23273==    by 0x806A30C: dialog_yesno (yesno.c:104)
-==23273==    by 0x804A728: call_yesno (dialog.c:600)
-==23273==    by 0x804CC56: main (dialog.c:1679)
-==23273== 
-==23273== 
-==23273== 16 bytes in 1 blocks are still reachable in loss record 7 of 62
-==23273==    at 0x4023D6E: malloc (vg_replace_malloc.c:207)
-==23273==    by 0x41165D0: tsearch (tsearch.c:281)
-==23273==    by 0x805FC92: make_cache (inputstr.c:149)
-==23273==    by 0x805FCF7: load_cache (inputstr.c:161)
-==23273==    by 0x805FECD: dlg_index_wchars (inputstr.c:341)
-==23273==    by 0x8059BBE: print_button (buttons.c:97)
-==23273==    by 0x805A265: dlg_draw_buttons (buttons.c:297)
-==23273==    by 0x806A2D0: dialog_yesno (yesno.c:98)
-==23273==    by 0x804A728: call_yesno (dialog.c:600)
-==23273==    by 0x804CC56: main (dialog.c:1679)
-==23273== 
-==23273== 
-==23273== 16 bytes in 1 blocks are still reachable in loss record 8 of 62
-==23273==    at 0x4023D6E: malloc (vg_replace_malloc.c:207)
-==23273==    by 0x41165D0: tsearch (tsearch.c:281)
-==23273==    by 0x805FC92: make_cache (inputstr.c:149)
-==23273==    by 0x805FCF7: load_cache (inputstr.c:161)
-==23273==    by 0x805FFB4: dlg_index_columns (inputstr.c:396)
-==23273==    by 0x8060166: dlg_count_columns (inputstr.c:473)
-==23273==    by 0x805A1F3: dlg_draw_buttons (buttons.c:296)
-==23273==    by 0x806A2D0: dialog_yesno (yesno.c:98)
-==23273==    by 0x804A728: call_yesno (dialog.c:600)
-==23273==    by 0x804CC56: main (dialog.c:1679)
-==23273== 
-==23273== 
-==23273== 16 bytes in 1 blocks are still reachable in loss record 9 of 62
-==23273==    at 0x4023D6E: malloc (vg_replace_malloc.c:207)
-==23273==    by 0x41165D0: tsearch (tsearch.c:281)
-==23273==    by 0x805FC92: make_cache (inputstr.c:149)
-==23273==    by 0x805FCF7: load_cache (inputstr.c:161)
-==23273==    by 0x805FFB4: dlg_index_columns (inputstr.c:396)
-==23273==    by 0x8060166: dlg_count_columns (inputstr.c:473)
-==23273==    by 0x8067711: real_auto_size (util.c:1101)
-==23273==    by 0x8067A1F: dlg_auto_size (util.c:1167)
-==23273==    by 0x806A14E: dialog_yesno (yesno.c:72)
-==23273==    by 0x804A728: call_yesno (dialog.c:600)
-==23273== 
-==23273== 
-==23273== 16 bytes in 1 blocks are still reachable in loss record 10 of 62
-==23273==    at 0x4023D6E: malloc (vg_replace_malloc.c:207)
-==23273==    by 0x807F2D5: _nc_doalloc (doalloc.c:55)
-==23273==    by 0x8086167: _nc_trace_alloc (trace_buf.c:55)
-==23273==    by 0x8086261: _nc_trace_buf (trace_buf.c:90)
-==23273==    by 0x80864A7: _nc_visbuf2n (visbuf.c:94)
-==23273==    by 0x8086538: _nc_visbuf2 (visbuf.c:114)
-==23273==    by 0x8086553: _nc_visbuf (visbuf.c:120)
-==23273==    by 0x8088693: recur_tries (trace_tries.c:55)
-==23273==    by 0x80886D7: recur_tries (trace_tries.c:59)
-==23273==    by 0x80886D7: recur_tries (trace_tries.c:59)
-==23273== 
-==23273== 
-==23273== 21 bytes in 1 blocks are still reachable in loss record 11 of 62
-==23273==    at 0x4023D6E: malloc (vg_replace_malloc.c:207)
-==23273==    by 0x40BE45F: strdup (strdup.c:43)
-==23273==    by 0x8081EE0: setupterm (lib_setup.c:471)
-==23273==    by 0x8072292: newterm (lib_newterm.c:115)
-==23273==    by 0x806E82C: initscr (lib_initscr.c:83)
-==23273==    by 0x8066211: init_dialog (util.c:292)
-==23273==    by 0x804C880: main (dialog.c:1604)
-==23273== 
-==23273== 
-==23273== 23 bytes in 1 blocks are still reachable in loss record 12 of 62
-==23273==    at 0x4023D6E: malloc (vg_replace_malloc.c:207)
-==23273==    by 0x8088526: _nc_home_terminfo (home_terminfo.c:57)
-==23273==    by 0x8085E1B: _nc_read_entry (read_entry.c:492)
-==23273==    by 0x8081834: grab_entry (lib_setup.c:255)
-==23273==    by 0x8081D46: setupterm (lib_setup.c:438)
-==23273==    by 0x8072292: newterm (lib_newterm.c:115)
-==23273==    by 0x806E82C: initscr (lib_initscr.c:83)
-==23273==    by 0x8066211: init_dialog (util.c:292)
-==23273==    by 0x804C880: main (dialog.c:1604)
-==23273== 
-==23273== 
-==23273== 24 bytes in 1 blocks are still reachable in loss record 13 of 62
-==23273==    at 0x4023D6E: malloc (vg_replace_malloc.c:207)
-==23273==    by 0x805FDE1: same_cache2 (inputstr.c:201)
-==23273==    by 0x805FEE7: dlg_index_wchars (inputstr.c:342)
-==23273==    by 0x8059BBE: print_button (buttons.c:97)
-==23273==    by 0x805A265: dlg_draw_buttons (buttons.c:297)
-==23273==    by 0x806A2D0: dialog_yesno (yesno.c:98)
-==23273==    by 0x804A728: call_yesno (dialog.c:600)
-==23273==    by 0x804CC56: main (dialog.c:1679)
-==23273== 
-==23273== 
-==23273== 24 bytes in 1 blocks are still reachable in loss record 14 of 62
-==23273==    at 0x4023D6E: malloc (vg_replace_malloc.c:207)
-==23273==    by 0x805FDE1: same_cache2 (inputstr.c:201)
-==23273==    by 0x805FFCE: dlg_index_columns (inputstr.c:397)
-==23273==    by 0x8060166: dlg_count_columns (inputstr.c:473)
-==23273==    by 0x805A1F3: dlg_draw_buttons (buttons.c:296)
-==23273==    by 0x806A2D0: dialog_yesno (yesno.c:98)
-==23273==    by 0x804A728: call_yesno (dialog.c:600)
-==23273==    by 0x804CC56: main (dialog.c:1679)
-==23273== 
-==23273== 
-==23273== 28 bytes in 1 blocks are still reachable in loss record 15 of 62
-==23273==    at 0x4021E22: calloc (vg_replace_malloc.c:397)
-==23273==    by 0x805FC0F: make_cache (inputstr.c:139)
-==23273==    by 0x805FCF7: load_cache (inputstr.c:161)
-==23273==    by 0x805FFB4: dlg_index_columns (inputstr.c:396)
-==23273==    by 0x8060166: dlg_count_columns (inputstr.c:473)
-==23273==    by 0x8066FD3: dlg_print_scrolled (util.c:886)
-==23273==    by 0x806A30C: dialog_yesno (yesno.c:104)
-==23273==    by 0x804A728: call_yesno (dialog.c:600)
-==23273==    by 0x804CC56: main (dialog.c:1679)
-==23273== 
-==23273== 
-==23273== 28 bytes in 1 blocks are still reachable in loss record 16 of 62
-==23273==    at 0x4021E22: calloc (vg_replace_malloc.c:397)
-==23273==    by 0x805FC0F: make_cache (inputstr.c:139)
-==23273==    by 0x805FCF7: load_cache (inputstr.c:161)
-==23273==    by 0x805FECD: dlg_index_wchars (inputstr.c:341)
-==23273==    by 0x8059BBE: print_button (buttons.c:97)
-==23273==    by 0x805A265: dlg_draw_buttons (buttons.c:297)
-==23273==    by 0x806A2D0: dialog_yesno (yesno.c:98)
-==23273==    by 0x804A728: call_yesno (dialog.c:600)
-==23273==    by 0x804CC56: main (dialog.c:1679)
-==23273== 
-==23273== 
-==23273== 28 bytes in 1 blocks are still reachable in loss record 17 of 62
-==23273==    at 0x4021E22: calloc (vg_replace_malloc.c:397)
-==23273==    by 0x805FC0F: make_cache (inputstr.c:139)
-==23273==    by 0x805FCF7: load_cache (inputstr.c:161)
-==23273==    by 0x805FFB4: dlg_index_columns (inputstr.c:396)
-==23273==    by 0x8060166: dlg_count_columns (inputstr.c:473)
-==23273==    by 0x805A1F3: dlg_draw_buttons (buttons.c:296)
-==23273==    by 0x806A2D0: dialog_yesno (yesno.c:98)
-==23273==    by 0x804A728: call_yesno (dialog.c:600)
-==23273==    by 0x804CC56: main (dialog.c:1679)
-==23273== 
-==23273== 
-==23273== 28 bytes in 1 blocks are still reachable in loss record 18 of 62
-==23273==    at 0x4021E22: calloc (vg_replace_malloc.c:397)
-==23273==    by 0x805FC0F: make_cache (inputstr.c:139)
-==23273==    by 0x805FCF7: load_cache (inputstr.c:161)
-==23273==    by 0x805FFB4: dlg_index_columns (inputstr.c:396)
-==23273==    by 0x8060166: dlg_count_columns (inputstr.c:473)
-==23273==    by 0x8067711: real_auto_size (util.c:1101)
-==23273==    by 0x8067A1F: dlg_auto_size (util.c:1167)
-==23273==    by 0x806A14E: dialog_yesno (yesno.c:72)
-==23273==    by 0x804A728: call_yesno (dialog.c:600)
-==23273==    by 0x804CC56: main (dialog.c:1679)
-==23273== 
-==23273== 
-==23273== 28 bytes in 2 blocks are still reachable in loss record 19 of 62
-==23273==    at 0x4023D6E: malloc (vg_replace_malloc.c:207)
-==23273==    by 0x805FDE1: same_cache2 (inputstr.c:201)
-==23273==    by 0x805FFCE: dlg_index_columns (inputstr.c:397)
-==23273==    by 0x8060166: dlg_count_columns (inputstr.c:473)
-==23273==    by 0x8059E3A: dlg_button_sizes (buttons.c:179)
-==23273==    by 0x8059F04: dlg_button_x_step (buttons.c:209)
-==23273==    by 0x805A02F: dlg_button_layout (buttons.c:234)
-==23273==    by 0x806A11F: dialog_yesno (yesno.c:71)
-==23273==    by 0x804A728: call_yesno (dialog.c:600)
-==23273==    by 0x804CC56: main (dialog.c:1679)
-==23273== 
-==23273== 
-==23273== 32 bytes in 2 blocks are still reachable in loss record 20 of 62
-==23273==    at 0x4023D6E: malloc (vg_replace_malloc.c:207)
-==23273==    by 0x41165D0: tsearch (tsearch.c:281)
-==23273==    by 0x805FC92: make_cache (inputstr.c:149)
-==23273==    by 0x805FCF7: load_cache (inputstr.c:161)
-==23273==    by 0x805FFB4: dlg_index_columns (inputstr.c:396)
-==23273==    by 0x8060166: dlg_count_columns (inputstr.c:473)
-==23273==    by 0x8059E3A: dlg_button_sizes (buttons.c:179)
-==23273==    by 0x8059F04: dlg_button_x_step (buttons.c:209)
-==23273==    by 0x805A02F: dlg_button_layout (buttons.c:234)
-==23273==    by 0x806A11F: dialog_yesno (yesno.c:71)
-==23273== 
-==23273== 
-==23273== 33 bytes in 1 blocks are still reachable in loss record 21 of 62
-==23273==    at 0x4023E8C: realloc (vg_replace_malloc.c:429)
-==23273==    by 0x807F2A9: _nc_doalloc (doalloc.c:50)
-==23273==    by 0x808620A: _nc_trace_alloc (trace_buf.c:63)
-==23273==    by 0x8086261: _nc_trace_buf (trace_buf.c:90)
-==23273==    by 0x80864A7: _nc_visbuf2n (visbuf.c:94)
-==23273==    by 0x8086538: _nc_visbuf2 (visbuf.c:114)
-==23273==    by 0x8086553: _nc_visbuf (visbuf.c:120)
-==23273==    by 0x8088693: recur_tries (trace_tries.c:55)
-==23273==    by 0x80886D7: recur_tries (trace_tries.c:59)
-==23273==    by 0x80886D7: recur_tries (trace_tries.c:59)
-==23273== 
-==23273== 
-==23273== 44 bytes in 1 blocks are still reachable in loss record 22 of 62
-==23273==    at 0x4023D6E: malloc (vg_replace_malloc.c:207)
-==23273==    by 0x805FDE1: same_cache2 (inputstr.c:201)
-==23273==    by 0x805FFCE: dlg_index_columns (inputstr.c:397)
-==23273==    by 0x8060166: dlg_count_columns (inputstr.c:473)
-==23273==    by 0x8067711: real_auto_size (util.c:1101)
-==23273==    by 0x8067A1F: dlg_auto_size (util.c:1167)
-==23273==    by 0x806A14E: dialog_yesno (yesno.c:72)
-==23273==    by 0x804A728: call_yesno (dialog.c:600)
-==23273==    by 0x804CC56: main (dialog.c:1679)
-==23273== 
-==23273== 
-==23273== 47 bytes in 1 blocks are still reachable in loss record 23 of 62
-==23273==    at 0x4023E8C: realloc (vg_replace_malloc.c:429)
-==23273==    by 0x807F2A9: _nc_doalloc (doalloc.c:50)
-==23273==    by 0x8085368: read_termtype (read_entry.c:283)
-==23273==    by 0x8085B64: _nc_read_file_entry (read_entry.c:392)
-==23273==    by 0x8085BF5: _nc_read_tic_entry (read_entry.c:413)
-==23273==    by 0x8085C8A: _nc_read_terminfo_dirs (read_entry.c:438)
-==23273==    by 0x8085E90: _nc_read_entry (read_entry.c:500)
-==23273==    by 0x8081834: grab_entry (lib_setup.c:255)
-==23273==    by 0x8081D46: setupterm (lib_setup.c:438)
-==23273==    by 0x8072292: newterm (lib_newterm.c:115)
-==23273== 
-==23273== 
-==23273== 55 bytes in 1 blocks are still reachable in loss record 24 of 62
-==23273==    at 0x4021E22: calloc (vg_replace_malloc.c:397)
-==23273==    by 0x8084EC3: read_termtype (read_entry.c:207)
-==23273==    by 0x8085B64: _nc_read_file_entry (read_entry.c:392)
-==23273==    by 0x8085BF5: _nc_read_tic_entry (read_entry.c:413)
-==23273==    by 0x8085C8A: _nc_read_terminfo_dirs (read_entry.c:438)
-==23273==    by 0x8085E90: _nc_read_entry (read_entry.c:500)
-==23273==    by 0x8081834: grab_entry (lib_setup.c:255)
-==23273==    by 0x8081D46: setupterm (lib_setup.c:438)
-==23273==    by 0x8072292: newterm (lib_newterm.c:115)
-==23273==    by 0x806E82C: initscr (lib_initscr.c:83)
-==23273== 
-==23273== 
-==23273== 56 bytes in 2 blocks are still reachable in loss record 25 of 62
-==23273==    at 0x4021E22: calloc (vg_replace_malloc.c:397)
-==23273==    by 0x805FC0F: make_cache (inputstr.c:139)
-==23273==    by 0x805FCF7: load_cache (inputstr.c:161)
-==23273==    by 0x805FFB4: dlg_index_columns (inputstr.c:396)
-==23273==    by 0x8060166: dlg_count_columns (inputstr.c:473)
-==23273==    by 0x8059E3A: dlg_button_sizes (buttons.c:179)
-==23273==    by 0x8059F04: dlg_button_x_step (buttons.c:209)
-==23273==    by 0x805A02F: dlg_button_layout (buttons.c:234)
-==23273==    by 0x806A11F: dialog_yesno (yesno.c:71)
-==23273==    by 0x804A728: call_yesno (dialog.c:600)
-==23273== 
-==23273== 
-==23273== 66 bytes in 1 blocks are still reachable in loss record 26 of 62
-==23273==    at 0x4023E8C: realloc (vg_replace_malloc.c:429)
-==23273==    by 0x807F2A9: _nc_doalloc (doalloc.c:50)
-==23273==    by 0x808238C: get_space (lib_tparm.c:155)
-==23273==    by 0x8082443: save_number (lib_tparm.c:180)
-==23273==    by 0x8082D8B: tparam_internal (lib_tparm.c:564)
-==23273==    by 0x80833C4: tparm (lib_tparm.c:788)
-==23273==    by 0x80704CF: _nc_mvcur_init (lib_mvcur.c:358)
-==23273==    by 0x8072684: newterm (lib_newterm.c:191)
-==23273==    by 0x806E82C: initscr (lib_initscr.c:83)
-==23273==    by 0x8066211: init_dialog (util.c:292)
-==23273== 
-==23273== 
-==23273== 80 bytes in 1 blocks are still reachable in loss record 27 of 62
-==23273==    at 0x4021E22: calloc (vg_replace_malloc.c:397)
-==23273==    by 0x8072E08: _nc_makenew (lib_newwin.c:218)
-==23273==    by 0x807299B: newwin (lib_newwin.c:126)
-==23273==    by 0x8074F9A: _nc_setupscreen (lib_set_term.c:459)
-==23273==    by 0x80723F1: newterm (lib_newterm.c:146)
-==23273==    by 0x806E82C: initscr (lib_initscr.c:83)
-==23273==    by 0x8066211: init_dialog (util.c:292)
-==23273==    by 0x804C880: main (dialog.c:1604)
-==23273== 
-==23273== 
-==23273== 80 bytes in 1 blocks are still reachable in loss record 28 of 62
-==23273==    at 0x4021E22: calloc (vg_replace_malloc.c:397)
-==23273==    by 0x8072E08: _nc_makenew (lib_newwin.c:218)
-==23273==    by 0x807299B: newwin (lib_newwin.c:126)
-==23273==    by 0x8074CB3: _nc_setupscreen (lib_set_term.c:414)
-==23273==    by 0x80723F1: newterm (lib_newterm.c:146)
-==23273==    by 0x806E82C: initscr (lib_initscr.c:83)
-==23273==    by 0x8066211: init_dialog (util.c:292)
-==23273==    by 0x804C880: main (dialog.c:1604)
-==23273== 
-==23273== 
-==23273== 80 bytes in 1 blocks are still reachable in loss record 29 of 62
-==23273==    at 0x4021E22: calloc (vg_replace_malloc.c:397)
-==23273==    by 0x8072E08: _nc_makenew (lib_newwin.c:218)
-==23273==    by 0x807299B: newwin (lib_newwin.c:126)
-==23273==    by 0x8074C55: _nc_setupscreen (lib_set_term.c:410)
-==23273==    by 0x80723F1: newterm (lib_newterm.c:146)
-==23273==    by 0x806E82C: initscr (lib_initscr.c:83)
-==23273==    by 0x8066211: init_dialog (util.c:292)
-==23273==    by 0x804C880: main (dialog.c:1604)
-==23273== 
-==23273== 
-==23273== 80 bytes in 1 blocks are still reachable in loss record 30 of 62
-==23273==    at 0x4023E8C: realloc (vg_replace_malloc.c:429)
-==23273==    by 0x807F2A9: _nc_doalloc (doalloc.c:50)
-==23273==    by 0x808538F: read_termtype (read_entry.c:284)
-==23273==    by 0x8085B64: _nc_read_file_entry (read_entry.c:392)
-==23273==    by 0x8085BF5: _nc_read_tic_entry (read_entry.c:413)
-==23273==    by 0x8085C8A: _nc_read_terminfo_dirs (read_entry.c:438)
-==23273==    by 0x8085E90: _nc_read_entry (read_entry.c:500)
-==23273==    by 0x8081834: grab_entry (lib_setup.c:255)
-==23273==    by 0x8081D46: setupterm (lib_setup.c:438)
-==23273==    by 0x8072292: newterm (lib_newterm.c:115)
-==23273== 
-==23273== 
-==23273== 112 bytes in 7 blocks are still reachable in loss record 31 of 62
-==23273==    at 0x4023D6E: malloc (vg_replace_malloc.c:207)
-==23273==    by 0x41165D0: tsearch (tsearch.c:281)
-==23273==    by 0x805FC92: make_cache (inputstr.c:149)
-==23273==    by 0x805FCF7: load_cache (inputstr.c:161)
-==23273==    by 0x805FFB4: dlg_index_columns (inputstr.c:396)
-==23273==    by 0x8066A0A: dlg_print_line (util.c:668)
-==23273==    by 0x8066E40: justify_text (util.c:813)
-==23273==    by 0x8066F5E: dlg_print_autowrap (util.c:843)
-==23273==    by 0x806703E: dlg_print_scrolled (util.c:892)
-==23273==    by 0x806A30C: dialog_yesno (yesno.c:104)
-==23273== 
-==23273== 
-==23273== 118 bytes in 1 blocks are still reachable in loss record 32 of 62
-==23273==    at 0x4023E8C: realloc (vg_replace_malloc.c:429)
-==23273==    by 0x807F2A9: _nc_doalloc (doalloc.c:50)
-==23273==    by 0x8082957: _nc_tparm_analyze (lib_tparm.c:374)
-==23273==    by 0x8082B5E: tparam_internal (lib_tparm.c:502)
-==23273==    by 0x80833C4: tparm (lib_tparm.c:788)
-==23273==    by 0x80782E6: vidputs (lib_vidattr.c:187)
-==23273==    by 0x8078B59: vidattr (lib_vidattr.c:270)
-==23273==    by 0x807ACE8: ClrToEOS (tty_update.c:957)
-==23273==    by 0x807AF54: ClrBottom (tty_update.c:1006)
-==23273==    by 0x807AB1C: ClrUpdate (tty_update.c:897)
-==23273== 
-==23273== 
-==23273== 128 bytes in 8 blocks are still reachable in loss record 33 of 62
-==23273==    at 0x4023D6E: malloc (vg_replace_malloc.c:207)
-==23273==    by 0x41165D0: tsearch (tsearch.c:281)
-==23273==    by 0x805FC92: make_cache (inputstr.c:149)
-==23273==    by 0x805FCF7: load_cache (inputstr.c:161)
-==23273==    by 0x805FECD: dlg_index_wchars (inputstr.c:341)
-==23273==    by 0x8066A18: dlg_print_line (util.c:669)
-==23273==    by 0x8066E40: justify_text (util.c:813)
-==23273==    by 0x8066F5E: dlg_print_autowrap (util.c:843)
-==23273==    by 0x806703E: dlg_print_scrolled (util.c:892)
-==23273==    by 0x806A30C: dialog_yesno (yesno.c:104)
-==23273== 
-==23273== 
-==23273== 128 bytes in 1 blocks are still reachable in loss record 34 of 62
-==23273==    at 0x4021E22: calloc (vg_replace_malloc.c:397)
-==23273==    by 0x806BDE0: start_color (lib_color.c:238)
-==23273==    by 0x80663B1: dlg_color_setup (util.c:360)
-==23273==    by 0x806638E: init_dialog (util.c:342)
-==23273==    by 0x804C880: main (dialog.c:1604)
-==23273== 
-==23273== 
-==23273== 128 bytes in 1 blocks are still reachable in loss record 35 of 62
-==23273==    at 0x4021E22: calloc (vg_replace_malloc.c:397)
-==23273==    by 0x806BDA7: start_color (lib_color.c:236)
-==23273==    by 0x80663B1: dlg_color_setup (util.c:360)
-==23273==    by 0x806638E: init_dialog (util.c:342)
-==23273==    by 0x804C880: main (dialog.c:1604)
-==23273== 
-==23273== 
-==23273== 160 bytes in 1 blocks are still reachable in loss record 36 of 62
-==23273==    at 0x4021E22: calloc (vg_replace_malloc.c:397)
-==23273==    by 0x8087176: _nc_hash_map (hashmap.c:299)
-==23273==    by 0x80865F4: _nc_scroll_optimize (hardscroll.c:199)
-==23273==    by 0x807A762: doupdate (tty_update.c:778)
-==23273==    by 0x8073C0A: wrefresh (lib_refresh.c:58)
-==23273==    by 0x806D95D: _nc_wgetch (lib_getch.c:295)
-==23273==    by 0x806DD0D: wgetch (lib_getch.c:467)
-==23273==    by 0x80654FC: really_getch (ui_getc.c:352)
-==23273==    by 0x806566B: dlg_getc (ui_getc.c:423)
-==23273==    by 0x80627C4: mouse_wgetch (mousewget.c:35)
-==23273== 
-==23273== 
-==23273== 160 bytes in 1 blocks are still reachable in loss record 37 of 62
-==23273==    at 0x4021E22: calloc (vg_replace_malloc.c:397)
-==23273==    by 0x8087141: _nc_hash_map (hashmap.c:297)
-==23273==    by 0x80865F4: _nc_scroll_optimize (hardscroll.c:199)
-==23273==    by 0x807A762: doupdate (tty_update.c:778)
-==23273==    by 0x8073C0A: wrefresh (lib_refresh.c:58)
-==23273==    by 0x806D95D: _nc_wgetch (lib_getch.c:295)
-==23273==    by 0x806DD0D: wgetch (lib_getch.c:467)
-==23273==    by 0x80654FC: really_getch (ui_getc.c:352)
-==23273==    by 0x806566B: dlg_getc (ui_getc.c:423)
-==23273==    by 0x80627C4: mouse_wgetch (mousewget.c:35)
-==23273== 
-==23273== 
-==23273== 160 bytes in 1 blocks are still reachable in loss record 38 of 62
-==23273==    at 0x4023D6E: malloc (vg_replace_malloc.c:207)
-==23273==    by 0x807F2D5: _nc_doalloc (doalloc.c:55)
-==23273==    by 0x80865CB: _nc_scroll_optimize (hardscroll.c:192)
-==23273==    by 0x807A762: doupdate (tty_update.c:778)
-==23273==    by 0x8073C0A: wrefresh (lib_refresh.c:58)
-==23273==    by 0x806D95D: _nc_wgetch (lib_getch.c:295)
-==23273==    by 0x806DD0D: wgetch (lib_getch.c:467)
-==23273==    by 0x80654FC: really_getch (ui_getc.c:352)
-==23273==    by 0x806566B: dlg_getc (ui_getc.c:423)
-==23273==    by 0x80627C4: mouse_wgetch (mousewget.c:35)
-==23273== 
-==23273== 
-==23273== 172 bytes in 1 blocks are still reachable in loss record 39 of 62
-==23273==    at 0x4021E22: calloc (vg_replace_malloc.c:397)
-==23273==    by 0x8081CD7: setupterm (lib_setup.c:431)
-==23273==    by 0x8072292: newterm (lib_newterm.c:115)
-==23273==    by 0x806E82C: initscr (lib_initscr.c:83)
-==23273==    by 0x8066211: init_dialog (util.c:292)
-==23273==    by 0x804C880: main (dialog.c:1604)
-==23273== 
-==23273== 
-==23273== 196 bytes in 7 blocks are still reachable in loss record 40 of 62
-==23273==    at 0x4021E22: calloc (vg_replace_malloc.c:397)
-==23273==    by 0x805FC0F: make_cache (inputstr.c:139)
-==23273==    by 0x805FCF7: load_cache (inputstr.c:161)
-==23273==    by 0x805FFB4: dlg_index_columns (inputstr.c:396)
-==23273==    by 0x8066A0A: dlg_print_line (util.c:668)
-==23273==    by 0x8066E40: justify_text (util.c:813)
-==23273==    by 0x8066F5E: dlg_print_autowrap (util.c:843)
-==23273==    by 0x806703E: dlg_print_scrolled (util.c:892)
-==23273==    by 0x806A30C: dialog_yesno (yesno.c:104)
-==23273==    by 0x804A728: call_yesno (dialog.c:600)
-==23273== 
-==23273== 
-==23273== 224 bytes in 8 blocks are still reachable in loss record 41 of 62
-==23273==    at 0x4021E22: calloc (vg_replace_malloc.c:397)
-==23273==    by 0x805FC0F: make_cache (inputstr.c:139)
-==23273==    by 0x805FCF7: load_cache (inputstr.c:161)
-==23273==    by 0x805FECD: dlg_index_wchars (inputstr.c:341)
-==23273==    by 0x8066A18: dlg_print_line (util.c:669)
-==23273==    by 0x8066E40: justify_text (util.c:813)
-==23273==    by 0x8066F5E: dlg_print_autowrap (util.c:843)
-==23273==    by 0x806703E: dlg_print_scrolled (util.c:892)
-==23273==    by 0x806A30C: dialog_yesno (yesno.c:104)
-==23273==    by 0x804A728: call_yesno (dialog.c:600)
-==23273== 
-==23273== 
-==23273== 252 bytes in 1 blocks are still reachable in loss record 42 of 62
-==23273==    at 0x4021E22: calloc (vg_replace_malloc.c:397)
-==23273==    by 0x80858B3: read_termtype (read_entry.c:345)
-==23273==    by 0x8085B64: _nc_read_file_entry (read_entry.c:392)
-==23273==    by 0x8085BF5: _nc_read_tic_entry (read_entry.c:413)
-==23273==    by 0x8085C8A: _nc_read_terminfo_dirs (read_entry.c:438)
-==23273==    by 0x8085E90: _nc_read_entry (read_entry.c:500)
-==23273==    by 0x8081834: grab_entry (lib_setup.c:255)
-==23273==    by 0x8081D46: setupterm (lib_setup.c:438)
-==23273==    by 0x8072292: newterm (lib_newterm.c:115)
-==23273==    by 0x806E82C: initscr (lib_initscr.c:83)
-==23273== 
-==23273== 
-==23273== 421 bytes in 1 blocks are still reachable in loss record 43 of 62
-==23273==    at 0x4023D6E: malloc (vg_replace_malloc.c:207)
-==23273==    by 0x8068E64: dlg_strclone (util.c:1740)
-==23273==    by 0x805FE72: same_cache2 (inputstr.c:212)
-==23273==    by 0x805FFCE: dlg_index_columns (inputstr.c:397)
-==23273==    by 0x8060166: dlg_count_columns (inputstr.c:473)
-==23273==    by 0x8066FD3: dlg_print_scrolled (util.c:886)
-==23273==    by 0x806A30C: dialog_yesno (yesno.c:104)
-==23273==    by 0x804A728: call_yesno (dialog.c:600)
-==23273==    by 0x804CC56: main (dialog.c:1679)
-==23273== 
-==23273== 
-==23273== 480 bytes in 1 blocks are still reachable in loss record 44 of 62
-==23273==    at 0x4021E22: calloc (vg_replace_malloc.c:397)
-==23273==    by 0x8072E36: _nc_makenew (lib_newwin.c:223)
-==23273==    by 0x807299B: newwin (lib_newwin.c:126)
-==23273==    by 0x8074F9A: _nc_setupscreen (lib_set_term.c:459)
-==23273==    by 0x80723F1: newterm (lib_newterm.c:146)
-==23273==    by 0x806E82C: initscr (lib_initscr.c:83)
-==23273==    by 0x8066211: init_dialog (util.c:292)
-==23273==    by 0x804C880: main (dialog.c:1604)
-==23273== 
-==23273== 
-==23273== 480 bytes in 1 blocks are still reachable in loss record 45 of 62
-==23273==    at 0x4021E22: calloc (vg_replace_malloc.c:397)
-==23273==    by 0x8072E36: _nc_makenew (lib_newwin.c:223)
-==23273==    by 0x807299B: newwin (lib_newwin.c:126)
-==23273==    by 0x8074CB3: _nc_setupscreen (lib_set_term.c:414)
-==23273==    by 0x80723F1: newterm (lib_newterm.c:146)
-==23273==    by 0x806E82C: initscr (lib_initscr.c:83)
-==23273==    by 0x8066211: init_dialog (util.c:292)
-==23273==    by 0x804C880: main (dialog.c:1604)
-==23273== 
-==23273== 
-==23273== 480 bytes in 1 blocks are still reachable in loss record 46 of 62
-==23273==    at 0x4021E22: calloc (vg_replace_malloc.c:397)
-==23273==    by 0x8072E36: _nc_makenew (lib_newwin.c:223)
-==23273==    by 0x807299B: newwin (lib_newwin.c:126)
-==23273==    by 0x8074C55: _nc_setupscreen (lib_set_term.c:410)
-==23273==    by 0x80723F1: newterm (lib_newterm.c:146)
-==23273==    by 0x806E82C: initscr (lib_initscr.c:83)
-==23273==    by 0x8066211: init_dialog (util.c:292)
-==23273==    by 0x804C880: main (dialog.c:1604)
-==23273== 
-==23273== 
-==23273== 689 bytes in 1 blocks are still reachable in loss record 47 of 62
-==23273==    at 0x4023D6E: malloc (vg_replace_malloc.c:207)
-==23273==    by 0x8085659: read_termtype (read_entry.c:318)
-==23273==    by 0x8085B64: _nc_read_file_entry (read_entry.c:392)
-==23273==    by 0x8085BF5: _nc_read_tic_entry (read_entry.c:413)
-==23273==    by 0x8085C8A: _nc_read_terminfo_dirs (read_entry.c:438)
-==23273==    by 0x8085E90: _nc_read_entry (read_entry.c:500)
-==23273==    by 0x8081834: grab_entry (lib_setup.c:255)
-==23273==    by 0x8081D46: setupterm (lib_setup.c:438)
-==23273==    by 0x8072292: newterm (lib_newterm.c:115)
-==23273==    by 0x806E82C: initscr (lib_initscr.c:83)
-==23273== 
-==23273== 
-==23273== 780 bytes in 65 blocks are still reachable in loss record 48 of 62
-==23273==    at 0x4021E22: calloc (vg_replace_malloc.c:397)
-==23273==    by 0x807F1FF: _nc_add_to_try (add_tries.c:104)
-==23273==    by 0x80885C6: _nc_init_keytry (init_keytry.c:74)
-==23273==    by 0x80807F4: _nc_keypad (lib_options.c:262)
-==23273==    by 0x808035F: keypad (lib_options.c:129)
-==23273==    by 0x8066340: init_dialog (util.c:330)
-==23273==    by 0x804C880: main (dialog.c:1604)
-==23273== 
-==23273== 
-==23273== 1,008 bytes in 84 blocks are still reachable in loss record 49 of 62
-==23273==    at 0x4021E22: calloc (vg_replace_malloc.c:397)
-==23273==    by 0x807F119: _nc_add_to_try (add_tries.c:77)
-==23273==    by 0x80885C6: _nc_init_keytry (init_keytry.c:74)
-==23273==    by 0x80807F4: _nc_keypad (lib_options.c:262)
-==23273==    by 0x808035F: keypad (lib_options.c:129)
-==23273==    by 0x8066340: init_dialog (util.c:330)
-==23273==    by 0x804C880: main (dialog.c:1604)
-==23273== 
-==23273== 
-==23273== 1,338 bytes in 1 blocks are still reachable in loss record 50 of 62
-==23273==    at 0x4023D6E: malloc (vg_replace_malloc.c:207)
-==23273==    by 0x8084DF7: read_termtype (read_entry.c:193)
-==23273==    by 0x8085B64: _nc_read_file_entry (read_entry.c:392)
-==23273==    by 0x8085BF5: _nc_read_tic_entry (read_entry.c:413)
-==23273==    by 0x8085C8A: _nc_read_terminfo_dirs (read_entry.c:438)
-==23273==    by 0x8085E90: _nc_read_entry (read_entry.c:500)
-==23273==    by 0x8081834: grab_entry (lib_setup.c:255)
-==23273==    by 0x8081D46: setupterm (lib_setup.c:438)
-==23273==    by 0x8072292: newterm (lib_newterm.c:115)
-==23273==    by 0x806E82C: initscr (lib_initscr.c:83)
-==23273== 
-==23273== 
-==23273== 1,382 bytes in 7 blocks are still reachable in loss record 51 of 62
-==23273==    at 0x4023D6E: malloc (vg_replace_malloc.c:207)
-==23273==    by 0x8068E64: dlg_strclone (util.c:1740)
-==23273==    by 0x805FE72: same_cache2 (inputstr.c:212)
-==23273==    by 0x805FFCE: dlg_index_columns (inputstr.c:397)
-==23273==    by 0x8066A0A: dlg_print_line (util.c:668)
-==23273==    by 0x8066E40: justify_text (util.c:813)
-==23273==    by 0x8066F5E: dlg_print_autowrap (util.c:843)
-==23273==    by 0x806703E: dlg_print_scrolled (util.c:892)
-==23273==    by 0x806A30C: dialog_yesno (yesno.c:104)
-==23273==    by 0x804A728: call_yesno (dialog.c:600)
-==23273== 
-==23273== 
-==23273== 1,520 bytes in 1 blocks are still reachable in loss record 52 of 62
-==23273==    at 0x4021E22: calloc (vg_replace_malloc.c:397)
-==23273==    by 0x80747CF: _nc_setupscreen (lib_set_term.c:221)
-==23273==    by 0x80723F1: newterm (lib_newterm.c:146)
-==23273==    by 0x806E82C: initscr (lib_initscr.c:83)
-==23273==    by 0x8066211: init_dialog (util.c:292)
-==23273==    by 0x804C880: main (dialog.c:1604)
-==23273== 
-==23273== 
-==23273== 1,640 bytes in 1 blocks are still reachable in loss record 53 of 62
-==23273==    at 0x4023D6E: malloc (vg_replace_malloc.c:207)
-==23273==    by 0x8087007: _nc_hash_map (hashmap.c:277)
-==23273==    by 0x80865F4: _nc_scroll_optimize (hardscroll.c:199)
-==23273==    by 0x807A762: doupdate (tty_update.c:778)
-==23273==    by 0x8073C0A: wrefresh (lib_refresh.c:58)
-==23273==    by 0x806D95D: _nc_wgetch (lib_getch.c:295)
-==23273==    by 0x806DD0D: wgetch (lib_getch.c:467)
-==23273==    by 0x80654FC: really_getch (ui_getc.c:352)
-==23273==    by 0x806566B: dlg_getc (ui_getc.c:423)
-==23273==    by 0x80627C4: mouse_wgetch (mousewget.c:35)
-==23273== 
-==23273== 
-==23273== 1,684 bytes in 1 blocks are still reachable in loss record 54 of 62
-==23273==    at 0x4023D6E: malloc (vg_replace_malloc.c:207)
-==23273==    by 0x805FDE1: same_cache2 (inputstr.c:201)
-==23273==    by 0x805FFCE: dlg_index_columns (inputstr.c:397)
-==23273==    by 0x8060166: dlg_count_columns (inputstr.c:473)
-==23273==    by 0x8066FD3: dlg_print_scrolled (util.c:886)
-==23273==    by 0x806A30C: dialog_yesno (yesno.c:104)
-==23273==    by 0x804A728: call_yesno (dialog.c:600)
-==23273==    by 0x804CC56: main (dialog.c:1679)
-==23273== 
-==23273== 
-==23273== 1,803 bytes in 8 blocks are still reachable in loss record 55 of 62
-==23273==    at 0x4023D6E: malloc (vg_replace_malloc.c:207)
-==23273==    by 0x8068E64: dlg_strclone (util.c:1740)
-==23273==    by 0x805FE72: same_cache2 (inputstr.c:212)
-==23273==    by 0x805FEE7: dlg_index_wchars (inputstr.c:342)
-==23273==    by 0x8066A18: dlg_print_line (util.c:669)
-==23273==    by 0x8066E40: justify_text (util.c:813)
-==23273==    by 0x8066F5E: dlg_print_autowrap (util.c:843)
-==23273==    by 0x806703E: dlg_print_scrolled (util.c:892)
-==23273==    by 0x806A30C: dialog_yesno (yesno.c:104)
-==23273==    by 0x804A728: call_yesno (dialog.c:600)
-==23273== 
-==23273== 
-==23273== 1,892 bytes in 1 blocks are still reachable in loss record 56 of 62
-==23273==    at 0x4023E8C: realloc (vg_replace_malloc.c:429)
-==23273==    by 0x807F2A9: _nc_doalloc (doalloc.c:50)
-==23273==    by 0x80853BA: read_termtype (read_entry.c:285)
-==23273==    by 0x8085B64: _nc_read_file_entry (read_entry.c:392)
-==23273==    by 0x8085BF5: _nc_read_tic_entry (read_entry.c:413)
-==23273==    by 0x8085C8A: _nc_read_terminfo_dirs (read_entry.c:438)
-==23273==    by 0x8085E90: _nc_read_entry (read_entry.c:500)
-==23273==    by 0x8081834: grab_entry (lib_setup.c:255)
-==23273==    by 0x8081D46: setupterm (lib_setup.c:438)
-==23273==    by 0x8072292: newterm (lib_newterm.c:115)
-==23273== 
-==23273== 
-==23273== 2,800 bytes in 1 blocks are still reachable in loss record 57 of 62
-==23273==    at 0x4023D6E: malloc (vg_replace_malloc.c:207)
-==23273==    by 0x8085F59: _nc_set_buffer (setbuf.c:119)
-==23273==    by 0x807481F: _nc_setupscreen (lib_set_term.c:232)
-==23273==    by 0x80723F1: newterm (lib_newterm.c:146)
-==23273==    by 0x806E82C: initscr (lib_initscr.c:83)
-==23273==    by 0x8066211: init_dialog (util.c:292)
-==23273==    by 0x804C880: main (dialog.c:1604)
-==23273== 
-==23273== 
-==23273== 5,528 bytes in 7 blocks are still reachable in loss record 58 of 62
-==23273==    at 0x4023D6E: malloc (vg_replace_malloc.c:207)
-==23273==    by 0x805FDE1: same_cache2 (inputstr.c:201)
-==23273==    by 0x805FFCE: dlg_index_columns (inputstr.c:397)
-==23273==    by 0x8066A0A: dlg_print_line (util.c:668)
-==23273==    by 0x8066E40: justify_text (util.c:813)
-==23273==    by 0x8066F5E: dlg_print_autowrap (util.c:843)
-==23273==    by 0x806703E: dlg_print_scrolled (util.c:892)
-==23273==    by 0x806A30C: dialog_yesno (yesno.c:104)
-==23273==    by 0x804A728: call_yesno (dialog.c:600)
-==23273==    by 0x804CC56: main (dialog.c:1679)
-==23273== 
-==23273== 
-==23273== 7,212 bytes in 8 blocks are still reachable in loss record 59 of 62
-==23273==    at 0x4023D6E: malloc (vg_replace_malloc.c:207)
-==23273==    by 0x805FDE1: same_cache2 (inputstr.c:201)
-==23273==    by 0x805FEE7: dlg_index_wchars (inputstr.c:342)
-==23273==    by 0x8066A18: dlg_print_line (util.c:669)
-==23273==    by 0x8066E40: justify_text (util.c:813)
-==23273==    by 0x8066F5E: dlg_print_autowrap (util.c:843)
-==23273==    by 0x806703E: dlg_print_scrolled (util.c:892)
-==23273==    by 0x806A30C: dialog_yesno (yesno.c:104)
-==23273==    by 0x804A728: call_yesno (dialog.c:600)
-==23273==    by 0x804CC56: main (dialog.c:1679)
-==23273== 
-==23273== 
-==23273== 12,800 bytes in 40 blocks are still reachable in loss record 60 of 62
-==23273==    at 0x4021E22: calloc (vg_replace_malloc.c:397)
-==23273==    by 0x80729EC: newwin (lib_newwin.c:130)
-==23273==    by 0x8074F9A: _nc_setupscreen (lib_set_term.c:459)
-==23273==    by 0x80723F1: newterm (lib_newterm.c:146)
-==23273==    by 0x806E82C: initscr (lib_initscr.c:83)
-==23273==    by 0x8066211: init_dialog (util.c:292)
-==23273==    by 0x804C880: main (dialog.c:1604)
-==23273== 
-==23273== 
-==23273== 12,800 bytes in 40 blocks are still reachable in loss record 61 of 62
-==23273==    at 0x4021E22: calloc (vg_replace_malloc.c:397)
-==23273==    by 0x80729EC: newwin (lib_newwin.c:130)
-==23273==    by 0x8074CB3: _nc_setupscreen (lib_set_term.c:414)
-==23273==    by 0x80723F1: newterm (lib_newterm.c:146)
-==23273==    by 0x806E82C: initscr (lib_initscr.c:83)
-==23273==    by 0x8066211: init_dialog (util.c:292)
-==23273==    by 0x804C880: main (dialog.c:1604)
-==23273== 
-==23273== 
-==23273== 12,800 bytes in 40 blocks are still reachable in loss record 62 of 62
-==23273==    at 0x4021E22: calloc (vg_replace_malloc.c:397)
-==23273==    by 0x80729EC: newwin (lib_newwin.c:130)
-==23273==    by 0x8074C55: _nc_setupscreen (lib_set_term.c:410)
-==23273==    by 0x80723F1: newterm (lib_newterm.c:146)
-==23273==    by 0x806E82C: initscr (lib_initscr.c:83)
-==23273==    by 0x8066211: init_dialog (util.c:292)
-==23273==    by 0x804C880: main (dialog.c:1604)
-==23273== 
-==23273== LEAK SUMMARY:
-==23273==    definitely lost: 0 bytes in 0 blocks.
-==23273==      possibly lost: 0 bytes in 0 blocks.
-==23273==    still reachable: 72,482 bytes in 382 blocks.
-==23273==         suppressed: 0 bytes in 0 blocks.
---23273--  memcheck: sanity checks: 8 cheap, 2 expensive
---23273--  memcheck: auxmaps: 0 auxmap entries (0k, 0M) in use
---23273--  memcheck: auxmaps_L1: 0 searches, 0 cmps, ratio 0:10
---23273--  memcheck: auxmaps_L2: 0 searches, 0 nodes
---23273--  memcheck: SMs: n_issued      = 11 (176k, 0M)
---23273--  memcheck: SMs: n_deissued    = 0 (0k, 0M)
---23273--  memcheck: SMs: max_noaccess  = 65535 (1048560k, 1023M)
---23273--  memcheck: SMs: max_undefined = 0 (0k, 0M)
---23273--  memcheck: SMs: max_defined   = 25 (400k, 0M)
---23273--  memcheck: SMs: max_non_DSM   = 11 (176k, 0M)
---23273--  memcheck: max sec V bit nodes:    21 (1k, 0M)
---23273--  memcheck: set_sec_vbits8 calls: 130 (new: 21, updates: 109)
---23273--  memcheck: max shadow mem size:   481k, 0M
---23273-- translate:            fast SP updates identified: 4,767 ( 83.0%)
---23273-- translate:   generic_known SP updates identified: 612 ( 10.6%)
---23273-- translate: generic_unknown SP updates identified: 358 (  6.2%)
---23273--     tt/tc: 11,509 tt lookups requiring 11,938 probes
---23273--     tt/tc: 11,509 fast-cache updates, 3 flushes
---23273--  transtab: new        5,099 (117,852 -> 1,563,594; ratio 132:10) [0 scs]
---23273--  transtab: dumped     0 (0 -> ??)
---23273--  transtab: discarded  9 (222 -> ??)
---23273-- scheduler: 864,676 jumps (bb entries).
---23273-- scheduler: 8/7,086 major/minor sched events.
---23273--    sanity: 9 cheap, 2 expensive checks.
---23273--    exectx: 769 lists, 102 contexts (avg 0 per list)
---23273--    exectx: 470 searches, 372 full compares (791 per 1000)
---23273--    exectx: 0 cmp2, 36 cmp4, 2,470 cmpAll
---23273--  errormgr: 69 supplist searches, 5,672 comparisons during search
---23273--  errormgr: 14 errlist searches, 36 comparisons during search
diff --git a/contrib/dialog/samples/wheel b/contrib/dialog/samples/wheel
index ff75f71..4adef26 100755
--- a/contrib/dialog/samples/wheel
+++ b/contrib/dialog/samples/wheel
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $Id: wheel,v 1.7 2010/01/13 01:44:12 tom Exp $
+# $Id: wheel,v 1.8 2012/06/29 09:59:40 tom Exp $
 
 . ./setup-vars
 
@@ -17,10 +17,10 @@ COLS=`expr $COLS - 30`
 
 # Takes an integer, multiplies it for COLS, divides for 132
 scalex() {
-  echo $[$1*$COLS/132]
+  expr $1 \* $COLS / 132
 }
 scaley() {
-  echo $[$1*$ROWS/60]
+  expr $1 \* $ROWS / 60
 }
 
 $DIALOG --backtitle "$TITLE" --no-shadow \
diff --git a/contrib/dialog/samples/whiptail.rc b/contrib/dialog/samples/whiptail.rc
index 8515012..b12e687 100644
--- a/contrib/dialog/samples/whiptail.rc
+++ b/contrib/dialog/samples/whiptail.rc
@@ -1,4 +1,4 @@
-# $Id: whiptail.rc,v 1.3 2011/01/17 00:15:54 tom Exp $
+# $Id: whiptail.rc,v 1.5 2011/10/15 01:01:16 tom Exp $
 # vile:confmode
 # Run-time configuration file for dialog, matches whiptail's color scheme.
 #
@@ -46,79 +46,79 @@ border_color = (WHITE,WHITE,ON)
 button_active_color = (WHITE,RED,ON)
 
 # Inactive button color
-button_inactive_color = (BLACK,WHITE,OFF)
+button_inactive_color = dialog_color
 
 # Active button key color
-button_key_active_color = (WHITE,RED,ON)
+button_key_active_color = button_active_color
 
 # Inactive button key color
-button_key_inactive_color = (BLACK,WHITE,OFF)
+button_key_inactive_color = dialog_color
 
 # Active button label color
-button_label_active_color = (WHITE,RED,ON)
+button_label_active_color = button_active_color
 
 # Inactive button label color
 button_label_inactive_color = (BLACK,WHITE,ON)
 
 # Input box color
-inputbox_color = (BLACK,WHITE,OFF)
+inputbox_color = dialog_color
 
 # Input box border color
-inputbox_border_color = (BLACK,WHITE,OFF)
+inputbox_border_color = dialog_color
 
 # Search box color
-searchbox_color = (BLACK,WHITE,OFF)
+searchbox_color = dialog_color
 
 # Search box title color
-searchbox_title_color = (RED,WHITE,ON)
+searchbox_title_color = title_color
 
 # Search box border color
-searchbox_border_color = (WHITE,WHITE,ON)
+searchbox_border_color = border_color
 
 # File position indicator color
-position_indicator_color = (RED,WHITE,ON)
+position_indicator_color = title_color
 
 # Menu box color
 menubox_color = (YELLOW,BLUE,OFF)
 
 # Menu box border color
-menubox_border_color = (YELLOW,BLUE,ON)
+menubox_border_color = screen_color
 
 # Item color
-item_color = (YELLOW,BLUE,OFF)
+item_color = menubox_color
 
 # Selected item color
-item_selected_color = (YELLOW,BLUE,ON)
+item_selected_color = screen_color
 
 # Tag color
-tag_color = (YELLOW,BLUE,ON)
+tag_color = screen_color
 
 # Selected tag color
-tag_selected_color = (YELLOW,BLUE,ON)
+tag_selected_color = screen_color
 
 # Tag key color
-tag_key_color = (YELLOW,BLUE,OFF)
+tag_key_color = menubox_color
 
 # Selected tag key color
 tag_key_selected_color = (WHITE,BLUE,ON)
 
 # Check box color
-check_color = (YELLOW,BLUE,OFF)
+check_color = menubox_color
 
 # Selected check box color
-check_selected_color = (YELLOW,BLUE,ON)
+check_selected_color = screen_color
 
 # Up arrow color
-uarrow_color = (YELLOW,BLUE,ON)
+uarrow_color = screen_color
 
 # Down arrow color
-darrow_color = (YELLOW,BLUE,ON)
+darrow_color = screen_color
 
 # Item help-text color
 itemhelp_color = (WHITE,BLACK,OFF)
 
 # Active form text color
-form_active_text_color = (WHITE,BLUE,ON)
+form_active_text_color = tag_key_selected_color
 
 # Form text color
 form_text_color = (WHITE,CYAN,ON)
@@ -128,3 +128,15 @@ form_item_readonly_color = (CYAN,WHITE,ON)
 
 # Dialog box gauge color
 gauge_color = (BLUE,WHITE,ON)
+
+# Dialog box border2 color
+border2_color = dialog_color
+
+# Input box border2 color
+inputbox_border2_color = dialog_color
+
+# Search box border2 color
+searchbox_border2_color = dialog_color
+
+# Menu box border2 color
+menubox_border2_color = dialog_color
diff --git a/contrib/dialog/samples/with-dquotes b/contrib/dialog/samples/with-dquotes
new file mode 100755
index 0000000..604f51b
--- /dev/null
+++ b/contrib/dialog/samples/with-dquotes
@@ -0,0 +1,3 @@
+#!/bin/sh
+# $Id: with-dquotes,v 1.1 2012/07/03 09:40:19 tom Exp $
+DIALOGOPTS="$DIALOGOPTS --quoted" "$@"
diff --git a/contrib/dialog/samples/with-squotes b/contrib/dialog/samples/with-squotes
new file mode 100755
index 0000000..6a08f9f
--- /dev/null
+++ b/contrib/dialog/samples/with-squotes
@@ -0,0 +1,3 @@
+#!/bin/sh
+# $Id: with-squotes,v 1.1 2012/07/03 09:40:29 tom Exp $
+DIALOGOPTS="$DIALOGOPTS --single-quoted" "$@"