diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | Src/Modules/terminfo.c | 42 |
2 files changed, 29 insertions, 18 deletions
diff --git a/ChangeLog b/ChangeLog index fe7cc96da..87ea496ec 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2003-06-24 Oliver Kiddle <opk@zsh.org> + + * 18626: Src/Modules/terminfo.c: Try to do a better job of arg + support for echoti, fixing compile problem on 64-bit Solaris + 2003-06-20 Peter Stephenson <pws@csr.com> * 18618: Etc/changelog2html.pl: Script to turn ChangeLog into diff --git a/Src/Modules/terminfo.c b/Src/Modules/terminfo.c index c8e5c23fb..b128e0bb5 100644 --- a/Src/Modules/terminfo.c +++ b/Src/Modules/terminfo.c @@ -59,8 +59,10 @@ static Param terminfo_pm; static int bin_echoti(char *name, char **argv, Options ops, int func) { - char *s, *t, *u; - int num, argct; + char *s, *t, **u; + int arg, num, strarg = 0; + long pars[] = {0, 0, 0, 0, 0, 0, 0, 0, 0}; + char *strcap[] = { "pfkey", "pfloc", "pfx", "pln", "pfxl", NULL }; s = *argv++; /* This depends on the termcap stuff in init.c */ @@ -92,28 +94,32 @@ bin_echoti(char *name, char **argv, Options ops, int func) zwarnnam(name, "no such terminfo capability: %s", s, 0); return 1; } - /* 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); + /* check that the number of arguments provided is not too high */ + if (arrlen(argv) > 9) { + zwarnnam(name, "too many arguments", NULL, 0); return 1; } + + /* check if we have a capability taking non-integers for parameters */ + for (u = strcap; *u && !strarg; u++) + strarg = !strcmp(s, *u); + + /* get the arguments */ + for (arg=0; argv[arg]; arg++) { + if (strarg && arg > 0) + pars[arg] = (long) argv[arg]; + else + pars[arg] = atoi(argv[arg]); + } + /* output string, through the proper termcap functions */ - if (!argct) - tputs(t, 1, putraw); + if (!arg) + putp(t); else { - num = (argv[1]) ? atoi(argv[1]) : atoi(*argv); - tputs(tparm(t, atoi(*argv)), num, putraw); + putp(tparm(t, pars[0], pars[1], pars[2], pars[3], pars[4], + pars[5], pars[6], pars[7], pars[8])); } return 0; - } /**/ |