Add an option for consoletype to always return 0. (#453798, <notting@redhat.com>)

This allows tcsh -e to work, with lang.sh. It's a hack, but there really
isn't a better way to solve it.

4 files changed, 13 insertions, 5 deletions

diff --git a/lang.csh b/lang.csh
index 0327a27a..3a6a667a 100755
--- a/lang.csh
+++ b/lang.csh
@@ -26,7 +26,7 @@ if ($sourced == 1) then
         endif
     endif
     
-    set consoletype=`/sbin/consoletype`
+    set consoletype=`/sbin/consoletype stdout`
 
     if ($?CHARSET) then
         switch ($CHARSET)
diff --git a/lang.sh b/lang.sh
index 475f3f20..74c31660 100755
--- a/lang.sh
+++ b/lang.sh
@@ -41,7 +41,10 @@ if [ "$sourced" = 1 ]; then
     [ -n "$LINGUAS" ] && export LINGUAS || unset LINGUAS
     [ -n "$_XKB_CHARSET" ] && export _XKB_CHARSET || unset _XKB_CHARSET
     
-    consoletype=$(/sbin/consoletype)
+    consoletype=$CONSOLETYPE
+    if [ -z "$consoletype" ]; then
+      consoletype=$(/sbin/consoletype stdout)
+    fi
 
     if [ -n "$CHARSET" ]; then
 	case $CHARSET in
diff --git a/src/consoletype.1 b/src/consoletype.1
index 3f4ec14b..ebd1d88c 100644
--- a/src/consoletype.1
+++ b/src/consoletype.1
@@ -3,7 +3,7 @@
 \fBconsoletype
 \- print type of the console connected to standard input
 .SH SYNOPSIS
-\fBconsoletype [\fIfg\fR]
+\fBconsoletype [\fIstdout\fR] [\fIfg\fR]
 .SH DESCRIPTION
 \fBconsoletype
 prints the type of console connected to standard input, and checks
@@ -29,6 +29,11 @@ if on serial console
 \fI2
 if on a pseudo terminal.
 .TP
+When passed the \fIstdout\fR argument, \fBconsoletype\fR returns
+.TP
+\fI0
+in all cases, and prints the console type to stdout.
+.TP
 When passed the \fIfg\fR argument, \fBconsoletype\fR returns
 .TP
 \fI0
@@ -36,4 +41,4 @@ if the console connected to standard input is the current virtual
 terminal
 .TP
 \fI1
-otherwise.
\ No newline at end of file
+otherwise.
diff --git a/src/consoletype.c b/src/consoletype.c
index ab7e7534..761a3c52 100644
--- a/src/consoletype.c
+++ b/src/consoletype.c
@@ -61,6 +61,6 @@ int main(int argc, char **argv)
 	    return 0;
     } else {
 	    printf("%s\n",type);
-	    return ret;
+	    return (argc > 1 && !strcmp(argv[1],"stdout")) ? 0 : ret;
     }
 }