diff options
| author | Peter Stephenson <pws@users.sourceforge.net> | 2002-08-12 10:22:14 +0000 |
|---|---|---|
| committer | Peter Stephenson <pws@users.sourceforge.net> | 2002-08-12 10:22:14 +0000 |
| commit | f948a8eb22e9d95e76c5cc99ceb232a1c0a2ef1e (patch) | |
| tree | 68742b4dcde389a5286641ac193d7bfd4b44f17e /Src/Modules/termcap.c | |
| parent | bbf7efdc834833d22a63cd4b4c89d9e019b0beaa (diff) | |
| download | zsh-f948a8eb22e9d95e76c5cc99ceb232a1c0a2ef1e.tar.gz zsh-f948a8eb22e9d95e76c5cc99ceb232a1c0a2ef1e.tar.xz zsh-f948a8eb22e9d95e76c5cc99ceb232a1c0a2ef1e.zip | |
17482 (Karl Tomlinson): Resolve problems with getting and setting termcap
and terminfo parameters
Diffstat (limited to 'Src/Modules/termcap.c')
| -rw-r--r-- | Src/Modules/termcap.c | 22 |
1 files changed, 14 insertions, 8 deletions
diff --git a/Src/Modules/termcap.c b/Src/Modules/termcap.c index 8ec8919d9..fb3c6f324 100644 --- a/Src/Modules/termcap.c +++ b/Src/Modules/termcap.c @@ -236,10 +236,6 @@ gettermcap(HashTable ht, char *name) pm = (Param) zhalloc(sizeof(struct param)); pm->nam = dupstring(name); pm->flags = PM_READONLY; - pm->sets.cfn = NULL; - pm->gets.cfn = strgetfn; - pm->sets.ifn = NULL; - pm->gets.ifn = intgetfn; pm->unsetfn = NULL; pm->ct = 0; pm->env = NULL; @@ -251,10 +247,15 @@ gettermcap(HashTable ht, char *name) /* logic in the following cascade copied from echotc, above */ if ((num = tgetnum(name)) != -1) { + pm->sets.ifn = NULL; + pm->gets.ifn = intgetfn; pm->u.val = num; pm->flags |= PM_INTEGER; return (HashNode) pm; } + + pm->sets.cfn = NULL; + pm->gets.cfn = strgetfn; switch (ztgetflag(name)) { case -1: break; @@ -338,10 +339,6 @@ scantermcap(HashTable ht, ScanFunc func, int flags) #endif pm = (Param) zhalloc(sizeof(struct param)); - pm->sets.cfn = NULL; - pm->gets.cfn = strgetfn; - pm->sets.ifn = NULL; - pm->gets.ifn = intgetfn; pm->unsetfn = NULL; pm->ct = 0; pm->env = NULL; @@ -350,6 +347,9 @@ scantermcap(HashTable ht, ScanFunc func, int flags) u = buf; pm->flags = PM_READONLY | PM_SCALAR; + pm->sets.cfn = NULL; + pm->gets.cfn = strgetfn; + for (capcode = (char **)boolcodes; *capcode; capcode++) { if ((num = ztgetflag(*capcode)) != -1) { pm->u.str = num ? dupstring("yes") : dupstring("no"); @@ -359,6 +359,9 @@ scantermcap(HashTable ht, ScanFunc func, int flags) } pm->flags = PM_READONLY | PM_INTEGER; + pm->sets.ifn = NULL; + pm->gets.ifn = intgetfn; + for (capcode = (char **)numcodes; *capcode; capcode++) { if ((num = tgetnum(*capcode)) != -1) { pm->u.val = num; @@ -368,6 +371,9 @@ scantermcap(HashTable ht, ScanFunc func, int flags) } pm->flags = PM_READONLY | PM_SCALAR; + pm->sets.cfn = NULL; + pm->gets.cfn = strgetfn; + for (capcode = (char **)strcodes; *capcode; capcode++) { if ((tcstr = (char *)tgetstr(*capcode,&u)) != NULL && tcstr != (char *)-1) { |