circlecloud
/
tmux
mirror of https://github.com/tmux/tmux.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

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

are better than exiting).
pull/3573/head
nicm 2023-04-28 05:59:35 +00:00
parent 8f34504736
commit bf636d9575
1 changed files with 24 additions and 14 deletions
Show Stats 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;
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);
}