From de7b456e596ff18032d2cbfdf244c66f36770da4 Mon Sep 17 00:00:00 2001
From: Devin Teske <dteske@FreeBSD.org>
Date: Thu, 21 Nov 2013 19:43:45 +0000
Subject: [PATCH] f_die() (see `bsdconfig includes -dF die') uses a dialog box
 (and has been documented as such; I just forgot). These utilities are
 command-line only and as such should stick to either using f_die without
 arguments or printf)

---
 usr.sbin/bsdconfig/dot/dot           | 2 +-
 usr.sbin/bsdconfig/includes/includes | 8 +++++---
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/usr.sbin/bsdconfig/dot/dot b/usr.sbin/bsdconfig/dot/dot
index e13a269ae51f..c2ef31968eb5 100755
--- a/usr.sbin/bsdconfig/dot/dot
+++ b/usr.sbin/bsdconfig/dot/dot
@@ -163,7 +163,7 @@ while getopts cdhi flag; do
 done
 shift $(( $OPTIND - 1 ))
 
-cd $BSDCFG_LIBE || f_die 1 "$msg_directory_not_found" "$BSDCFG_LIB"
+cd $BSDCFG_LIBE || f_die # Pedantic
 
 #
 # Get a list of menu programs
diff --git a/usr.sbin/bsdconfig/includes/includes b/usr.sbin/bsdconfig/includes/includes
index 338a4f5e1f1d..28802a09dcb8 100755
--- a/usr.sbin/bsdconfig/includes/includes
+++ b/usr.sbin/bsdconfig/includes/includes
@@ -137,7 +137,7 @@ done
 shift $(( $OPTIND - 1 ))
 
 # cd(1) to `share' dir so relative paths work for find and positional args
-cd $BSDCFG_SHARE || f_die 1 "$msg_directory_not_found" "$BSDCFG_SHARE"
+cd $BSDCFG_SHARE || f_die # Pedantic
 
 #
 # If given an argument, operate on it specifically (implied `-f') and exit
@@ -147,9 +147,11 @@ for include in "$@"; do
 	# See if they've just omitted the `*.subr' suffix
 	[ -f "$include.subr" -a ! -f "$include" ] && include="$include.subr"
 	if [ ! -f "$include" ]; then
-		f_die 1 "$msg_no_such_file_or_directory" "$0" "$include"
+		printf "$msg_no_such_file_or_directory" "$0" "$include"
+		exit $FAILURE
 	elif [ ! -r "$include" ]; then
-		f_die 1 "$msg_permission_denied" "$0" "$include"
+		printf "$msg_permission_denied" "$0" "$include"
+		exit $FAILURE
 	fi
 	show_include "$include" || f_die
 done