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/tset.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/tset.c')
| -rw-r--r-- | usr.bin/tset/tset.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/usr.bin/tset/tset.c b/usr.bin/tset/tset.c index c146547..7a7ca82 100644 --- a/usr.bin/tset/tset.c +++ b/usr.bin/tset/tset.c @@ -62,10 +62,10 @@ void usage __P((void)); struct termios mode, oldmode; -int erasechar; /* new erase character */ +int erasech; /* new erase character */ int intrchar; /* new interrupt character */ int isreset; /* invoked as reset */ -int killchar; /* new kill character */ +int killch; /* new kill character */ int Lines, Columns; /* window size */ speed_t Ospeed; @@ -110,7 +110,7 @@ main(argc, argv) add_mapping("dialup", optarg); break; case 'e': /* erase character */ - erasechar = optarg[0] == '^' && optarg[1] != '\0' ? + erasech = optarg[0] == '^' && optarg[1] != '\0' ? optarg[1] == '?' ? '\177' : CTRL(optarg[1]) : optarg[0]; break; @@ -123,7 +123,7 @@ main(argc, argv) optarg[0]; break; case 'k': /* kill character */ - killchar = optarg[0] == '^' && optarg[1] != '\0' ? + killch = optarg[0] == '^' && optarg[1] != '\0' ? optarg[1] == '?' ? '\177' : CTRL(optarg[1]) : optarg[0]; break; |
