From bc3f5ec90bde2f3a5e4021d133c89793d68b8c73 Mon Sep 17 00:00:00 2001
From: Devin Teske <dteske@FreeBSD.org>
Date: Fri, 14 Mar 2014 02:56:49 +0000
Subject: [PATCH] Remove useless NULL string '' in compound strings. Look very
 closely.

---
 usr.sbin/bsdconfig/share/keymap.subr         | 2 +-
 usr.sbin/bsdconfig/timezone/share/menus.subr | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/usr.sbin/bsdconfig/share/keymap.subr b/usr.sbin/bsdconfig/share/keymap.subr
index 39b6b541c643..d4f391c8c8b8 100644
--- a/usr.sbin/bsdconfig/share/keymap.subr
+++ b/usr.sbin/bsdconfig/share/keymap.subr
@@ -165,7 +165,7 @@ f_keymap_get_all()
 			marks[keym] = mark
 			name = keym
 			gsub(/[^[:alnum:]_]/, "_", name)
-			gsub(/'\''/, "'\''\\'\'''\''", desc);
+			gsub(/'\''/, "'\''\\'\'\''", desc);
 			printf "f_keymap_checkfile %s && " \
 			       "f_keymap_register %s '\'%s\'' %s %u\n",
 			       keym, name, desc, keym, mark
diff --git a/usr.sbin/bsdconfig/timezone/share/menus.subr b/usr.sbin/bsdconfig/timezone/share/menus.subr
index 2028bf3f9f3a..ef3979be49a5 100644
--- a/usr.sbin/bsdconfig/timezone/share/menus.subr
+++ b/usr.sbin/bsdconfig/timezone/share/menus.subr
@@ -104,7 +104,7 @@ f_make_menus_awk='
 function add_zone_n_to_country_menu(tlc, n)
 {
 	zone_title = ENVIRON["country_" tlc "_descr_" n]
-	gsub(/'\''/, "'\''\\'\'''\''", zone_title)
+	gsub(/'\''/, "'\''\\'\'\''", zone_title)
 	country_menu_list[tlc] = country_menu_list[tlc] \
 		( length(country_menu_list[tlc]) > 0 ? "\n" : "" ) \
 		n " '\''" zone_title "'\''"
@@ -121,7 +121,7 @@ BEGIN {
 	{
 		tlc = countries[cp]
 		title = ENVIRON["country_" tlc "_name"]
-		gsub(/'\''/, "'\''\\'\'''\''", title)
+		gsub(/'\''/, "'\''\\'\'\''", title)
 		nzones = ENVIRON["country_" tlc "_nzones"]
 		if (!nzones)
 		{