From bf636d9575806134ca7efd917ee0d54e9330ae86 Mon Sep 17 00:00:00 2001
From: nicm <nicm>
Date: Fri, 28 Apr 2023 05:59:35 +0000
Subject: Do not fatal if tparm fails, instead just log it (not working
 sequences are better than exiting).

---
 tty-term.c | 38 ++++++++++++++++++++++++--------------
 1 file changed, 24 insertions(+), 14 deletions(-)

(limited to 'tty-term.c')

diff --git a/tty-term.c b/tty-term.c
index 94d2f66c..9b897c67 100644
--- a/tty-term.c
+++ b/tty-term.c
@@ -759,8 +759,10 @@ tty_term_string_i(struct tty_term *term, enum tty_code_code code, int a)
 	const char	*x = tty_term_string(term, code), *s;
 
 	s = tparm((char *)x, a);
-	if (s == NULL)
-		fatalx("could not expand %s", tty_term_codes[code].name);
+	if (s == NULL) {
+		log_debug("could not expand %s", tty_term_codes[code].name);
+		return ("");
+	}
 	return (s);
 }
 
@@ -770,20 +772,24 @@ tty_term_string_ii(struct tty_term *term, enum tty_code_code code, int a, int b)
 	const char	*x = tty_term_string(term, code), *s;
 
 	s = tparm((char *)x, a, b);
-	if (s == NULL)
-		fatalx("could not expand %s", tty_term_codes[code].name);
+	if (s == NULL) {
+		log_debug("could not expand %s", tty_term_codes[code].name);
+		return ("");
+	}
 	return (s);
 }
 
 const char *
-tty_term_string_iii(struct tty_term *term, enum tty_code_code code, int a, int b,
-    int c)
+tty_term_string_iii(struct tty_term *term, enum tty_code_code code, int a,
+    int b, int c)
 {
 	const char	*x = tty_term_string(term, code), *s;
 
 	s = tparm((char *)x, a, b, c);
-	if (s == NULL)
-		fatalx("could not expand %s", tty_term_codes[code].name);
+	if (s == NULL) {
+		log_debug("could not expand %s", tty_term_codes[code].name);
+		return ("");
+	}
 	return (s);
 }
 
@@ -793,20 +799,24 @@ tty_term_string_s(struct tty_term *term, enum tty_code_code code, const char *a)
 	const char	*x = tty_term_string(term, code), *s;
 
 	s = tparm((char *)x, (long)a);
-	if (s == NULL)
-		fatalx("could not expand %s", tty_term_codes[code].name);
+	if (s == NULL) {
+		log_debug("could not expand %s", tty_term_codes[code].name);
+		return ("");
+	}
 	return (s);
 }
 
 const char *
-tty_term_string_ss(struct tty_term *term, enum tty_code_code code, const char *a,
-    const char *b)
+tty_term_string_ss(struct tty_term *term, enum tty_code_code code,
+    const char *a, const char *b)
 {
 	const char	*x = tty_term_string(term, code), *s;
 
 	s = tparm((char *)x, (long)a, (long)b);
-	if (s == NULL)
-		fatalx("could not expand %s", tty_term_codes[code].name);
+	if (s == NULL) {
+		log_debug("could not expand %s", tty_term_codes[code].name);
+		return ("");
+	}
 	return (s);
 }
 
-- 
cgit v1.2.3