From: Sami Kerola <kerolasa@iki.fi>
Date: Wed, 7 Jan 2015 21:30:54 +0000 (+0000)
Subject: ul: remove unexplained TERM=lpr override
X-Git-Tag: v2.26-rc1~62^2~3
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=97d8f180b6af194004ef29ddb9a644c8e1fb079e;p=thirdparty%2Futil-linux.git

ul: remove unexplained TERM=lpr override

The FIXME item has been in place since 2011-04-30, and the code has never
made sense, so remove it.

Signed-off-by: Sami Kerola <kerolasa@iki.fi>
---

diff --git a/text-utils/ul.c b/text-utils/ul.c
index 30cad791dd..7765b571e6 100644
--- a/text-utils/ul.c
+++ b/text-utils/ul.c
@@ -174,15 +174,6 @@ int main(int argc, char **argv)
 
 	termtype = getenv("TERM");
 
-	/*
-	 * FIXME: why terminal type is lpr when command begins with c and has
-	 * no terminal? If this behavior can be explained please insert
-	 * reference or remove the code. In case this truly is desired command
-	 * behavior this should be mentioned in manual page.
-	 */
-	if (termtype == NULL || (argv[0][0] == 'c' && !isatty(STDOUT_FILENO)))
-		termtype = "lpr";
-
 	while ((c = getopt_long(argc, argv, "it:T:Vh", longopts, NULL)) != -1)
 		switch (c) {