From f40175fcbd5a83735af0e0feee24f648478658eb Mon Sep 17 00:00:00 2001
From: Zac Medico <zmedico@gentoo.org>
Date: Wed, 2 May 2007 17:23:44 +0000
Subject: Fix eend so that it works properly on a standard BSD console.  Thanks
 to UberLord. (trunk r6466:6467)

svn path=/main/branches/2.1.2/; revision=6468
---
 bin/isolated-functions.sh | 2 ++
 pym/output.py             | 3 +++
 2 files changed, 5 insertions(+)
 mode change 100755 => 100644 bin/isolated-functions.sh

diff --git a/bin/isolated-functions.sh b/bin/isolated-functions.sh
old mode 100755
new mode 100644
index 5aa838ba9..01fbbf272
--- a/bin/isolated-functions.sh
+++ b/bin/isolated-functions.sh
@@ -206,6 +206,8 @@ set_colors() {
 	(( COLS == 0 )) && COLS=$(set -- $(stty size 2>/dev/null) ; echo $2)
 	(( COLS > 0 )) || (( COLS = 80 ))
 	COLS=$((${COLS} - 8))	# width of [ ok ] == 7
+	# Adjust COLS so that eend works properly on a standard BSD console.
+	[ "${TERM}" = "cons25" ] && COLS=$((${COLS} - 1))
 
 	ENDCOL=$'\e[A\e['${COLS}'C'    # Now, ${ENDCOL} will move us to the end of the
 	                               # column;  irregardless of character width
diff --git a/pym/output.py b/pym/output.py
index 660f06999..8c8813e42 100644
--- a/pym/output.py
+++ b/pym/output.py
@@ -277,6 +277,9 @@ class EOutput:
 				pass
 		if columns <= 0:
 			columns = 80
+		# Adjust columns so that eend works properly on a standard BSD console.
+		if os.environ.get("TERM") == "cons25":
+			columns = columns - 1
 		self.term_columns = columns
 
 	def __eend(self, caller, errno, msg):
-- 
cgit v1.2.3-1-g7c22