diff options
| author | dg <dg@FreeBSD.org> | 2000-11-11 23:03:38 +0000 |
|---|---|---|
| committer | dg <dg@FreeBSD.org> | 2000-11-11 23:03:38 +0000 |
| commit | 3d05ea18329d0232b9f11453c046a6ba9a0b88fd (patch) | |
| tree | b46acd9b141721d39cdf57d92b6f9f9c90503cf2 /usr.bin/tset/set.c | |
| parent | 41a2af4aa78cb0838a57ddf63eaf05e17d92e122 (diff) | |
| download | FreeBSD-src-3d05ea18329d0232b9f11453c046a6ba9a0b88fd.zip FreeBSD-src-3d05ea18329d0232b9f11453c046a6ba9a0b88fd.tar.gz | |
Changed variable killchar to killch and erasechar to erasech to avoid
a name clash with the library functions of the same name (in libncurses).
This problem was masked when building tset shared (the local symbols had
precedence), but caused tset to core dump when it was built -static.
Diffstat (limited to 'usr.bin/tset/set.c')
| -rw-r--r-- | usr.bin/tset/set.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/usr.bin/tset/set.c b/usr.bin/tset/set.c index e5c52cf..515a87d 100644 --- a/usr.bin/tset/set.c +++ b/usr.bin/tset/set.c @@ -169,19 +169,19 @@ set_control_chars() else bs_char = 0; - if (erasechar == 0 && bs_char != 0 && !tgetflag("os")) - erasechar = -1; - if (erasechar < 0) - erasechar = (bs_char != 0) ? bs_char : CTRL('h'); + if (erasech == 0 && bs_char != 0 && !tgetflag("os")) + erasech = -1; + if (erasech < 0) + erasech = (bs_char != 0) ? bs_char : CTRL('h'); - if (mode.c_cc[VERASE] == 0 || erasechar != 0) - mode.c_cc[VERASE] = erasechar ? erasechar : CERASE; + if (mode.c_cc[VERASE] == 0 || erasech != 0) + mode.c_cc[VERASE] = erasech ? erasech : CERASE; if (mode.c_cc[VINTR] == 0 || intrchar != 0) mode.c_cc[VINTR] = intrchar ? intrchar : CINTR; - if (mode.c_cc[VKILL] == 0 || killchar != 0) - mode.c_cc[VKILL] = killchar ? killchar : CKILL; + if (mode.c_cc[VKILL] == 0 || killch != 0) + mode.c_cc[VKILL] = killch ? killch : CKILL; } /* |
