From: Karel Zak <kzak@redhat.com>
Date: Wed, 31 May 2023 07:18:06 +0000 (+0200)
Subject: ttyutils: improve get_terminal_default_type() code
X-Git-Tag: v2.40-rc1~419^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=84a8f5edb2b8eeb62273caf7da4ef85a6cfc3e20;p=thirdparty%2Futil-linux.git

ttyutils: improve get_terminal_default_type() code

Signed-off-by: Karel Zak <kzak@redhat.com>
---

diff --git a/lib/ttyutils.c b/lib/ttyutils.c
index 7c8860e63b..bacd730772 100644
--- a/lib/ttyutils.c
+++ b/lib/ttyutils.c
@@ -163,17 +163,15 @@ int get_terminal_type(const char **type)
 
 char *get_terminal_default_type(const char *ttyname, int is_serial)
 {
-#ifdef HAVE_GETTTYNAM
 	if (ttyname) {
+#ifdef HAVE_GETTTYNAM
 		struct ttyent *ent = getttynam(ttyname);
 
 		if (ent && ent->ty_type)
 			return strdup(ent->ty_type);
-	}
 #endif
 
 #if defined (__s390__) || defined (__s390x__)
-	if (ttyname) {
 		/*
 		 * Special terminal on first serial line on a S/390(x) which
 		 * is due legacy reasons a block terminal of type 3270 or
@@ -186,8 +184,8 @@ char *get_terminal_default_type(const char *ttyname, int is_serial)
 			return strdup(DEFAULT_TTY32);
 		else if (strcmp(ttyname, "ttyS1") == 0)		/* linux/drivers/s390/char/sclp_vt220.c */
 			return strdup(DEFAULT_TTYS1);
-	}
 #endif
+	}
 
 	return strdup(is_serial ? DEFAULT_STERM : DEFAULT_VCTERM);
 }