diff options
Diffstat (limited to 'Src/Modules/terminfo.c')
-rw-r--r-- | Src/Modules/terminfo.c | 38 |
1 files changed, 33 insertions, 5 deletions
diff --git a/Src/Modules/terminfo.c b/Src/Modules/terminfo.c index ca54a333e..b3fb83e2a 100644 --- a/Src/Modules/terminfo.c +++ b/Src/Modules/terminfo.c @@ -51,6 +51,12 @@ static char terminfo_nam[] = "terminfo"; # include <term.h> # endif +/* If ERR isn't defined, we probably have bigger problems, + * but try this anyway. */ +# ifndef ERR +# define ERR (-1) +# endif + static Param terminfo_pm; /* echoti: output a terminfo capability */ @@ -59,8 +65,8 @@ static Param terminfo_pm; static int bin_echoti(char *name, char **argv, char *ops, int func) { - char *s, *t; - int num; + char *s, *t, *u; + int num, argct; s = *argv++; /* This depends on the termcap stuff in init.c */ @@ -92,9 +98,28 @@ bin_echoti(char *name, char **argv, char *ops, int func) zwarnnam(name, "no such terminfo capability: %s", s, 0); return 1; } - - tputs(t, 1, putchar); + /* count the number of arguments required */ + for (argct = 0, u = t; *u; u++) + if (*u == '%') { + if (u++, (*u == 'd' || *u == '2' || *u == '3' || *u == '.' || + *u == '+')) + argct++; + } + /* check that the number of arguments provided is correct */ + if (arrlen(argv) != argct) { + zwarnnam(name, (arrlen(argv) < argct) ? "not enough arguments" : + "too many arguments", NULL, 0); + return 1; + } + /* output string, through the proper termcap functions */ + if (!argct) + tputs(t, 1, putraw); + else { + num = (argv[1]) ? atoi(argv[1]) : atoi(*argv); + tputs(tparm(t, atoi(*argv)), num, putraw); + } return 0; + } /**/ @@ -351,7 +376,10 @@ boot_(Module m) { #ifdef HAVE_TIGETSTR # ifdef HAVE_SETUPTERM - setupterm((char *)0, 1, (int *)0); + int errret; + + if (setupterm((char *)0, 1, &errret) == ERR) + return 1; # endif if (!createtihash()) |