circlecloud/tmux
1
0
Fork 0
mirror of https://github.com/tmux/tmux.git synced 2025-11-04 00:56:10 +00:00
Code Issues Projects Releases Wiki Activity

Do not fatal if tparm fails, instead just log it (not working sequences

Browse Source 
are better than exiting).
This commit is contained in:
nicm
2023-04-28 05:59:35 +00:00
parent 8f34504736
commit bf636d9575
1 changed files with 24 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
tty-term.c
View File

@@ -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; const char *x = tty_term_string(term, code), *s;
s = tparm((char *)x, a); s = tparm((char *)x, a);
if (s == NULL) if (s == NULL) {
fatalx("could not expand %s", tty_term_codes[code].name); log_debug("could not expand %s", tty_term_codes[code].name);
return ("");
}
return (s); 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; const char *x = tty_term_string(term, code), *s;
s = tparm((char *)x, a, b); s = tparm((char *)x, a, b);
if (s == NULL) if (s == NULL) {
fatalx("could not expand %s", tty_term_codes[code].name); log_debug("could not expand %s", tty_term_codes[code].name);
return ("");
}
return (s); return (s);
} }
const char * const char *
tty_term_string_iii(struct tty_term *term, enum tty_code_code code, int a, int b, tty_term_string_iii(struct tty_term *term, enum tty_code_code code, int a,
int c) int b, int c)
{ {
const char *x = tty_term_string(term, code), *s; const char *x = tty_term_string(term, code), *s;
s = tparm((char *)x, a, b, c); s = tparm((char *)x, a, b, c);
if (s == NULL) if (s == NULL) {
fatalx("could not expand %s", tty_term_codes[code].name); log_debug("could not expand %s", tty_term_codes[code].name);
return ("");
}
return (s); 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; const char *x = tty_term_string(term, code), *s;
s = tparm((char *)x, (long)a); s = tparm((char *)x, (long)a);
if (s == NULL) if (s == NULL) {
fatalx("could not expand %s", tty_term_codes[code].name); log_debug("could not expand %s", tty_term_codes[code].name);
return ("");
}
return (s); return (s);
} }
const char * const char *
tty_term_string_ss(struct tty_term *term, enum tty_code_code code, const char *a, tty_term_string_ss(struct tty_term *term, enum tty_code_code code,
const char *b) const char *a, const char *b)
{ {
const char *x = tty_term_string(term, code), *s; const char *x = tty_term_string(term, code), *s;
s = tparm((char *)x, (long)a, (long)b); s = tparm((char *)x, (long)a, (long)b);
if (s == NULL) if (s == NULL) {
fatalx("could not expand %s", tty_term_codes[code].name); log_debug("could not expand %s", tty_term_codes[code].name);
return ("");
}
return (s); return (s);
} }