diff options
| author | Todd C. Miller <millert@cvs.openbsd.org> | 1998-10-16 18:51:22 +0000 |
|---|---|---|
| committer | Todd C. Miller <millert@cvs.openbsd.org> | 1998-10-16 18:51:22 +0000 |
| commit | ca8f791d2508b1663727a6c63aaed37eb4008e3a (patch) | |
| tree | 41d8624fd4303cfa6573f9b0da34ceec3a427999 /usr.bin/tset/tset.c | |
| parent | 98cb38d5f2cd756345518ad6827a828d7bc467e7 (diff) | |
don't dump core when linked against ncurses
Diffstat (limited to 'usr.bin/tset/tset.c')
| -rw-r--r-- | usr.bin/tset/tset.c | 29 |
1 files changed, 21 insertions, 8 deletions
diff --git a/usr.bin/tset/tset.c b/usr.bin/tset/tset.c index 87d38d2b4c3..672c437f50f 100644 --- a/usr.bin/tset/tset.c +++ b/usr.bin/tset/tset.c @@ -1,4 +1,4 @@ -/* $OpenBSD: tset.c,v 1.5 1998/04/25 04:30:39 millert Exp $ */ +/* $OpenBSD: tset.c,v 1.6 1998/10/16 18:51:21 millert Exp $ */ /* $NetBSD: tset.c,v 1.4 1994/12/07 05:08:15 jtc Exp $ */ /*- @@ -44,7 +44,7 @@ static char copyright[] = #if 0 static char sccsid[] = "@(#)tset.c 8.1 (Berkeley) 6/9/93"; #endif -static char rcsid[] = "$OpenBSD: tset.c,v 1.5 1998/04/25 04:30:39 millert Exp $"; +static char rcsid[] = "$OpenBSD: tset.c,v 1.6 1998/10/16 18:51:21 millert Exp $"; #endif /* not lint */ #include <sys/types.h> @@ -218,7 +218,8 @@ main(argc, argv) if (Sflag) { (void)printf("%s ", ttype); - wrtermcap(tcapbuf); + if (tcapbuf) + wrtermcap(tcapbuf); } if (sflag) { @@ -228,14 +229,26 @@ main(argc, argv) */ if ((p = getenv("SHELL")) && !strcmp(p + strlen(p) - 3, "csh")) { - p = "set noglob histchars="";\nsetenv TERM %s;\nsetenv TERMCAP '"; - t = "';\nunset noglob histchars;\n"; + if (tcapbuf) + p = "set noglob histchars="";\nsetenv TERM %s;\nsetenv TERMCAP "; + else + p = "set noglob histchars="";\nsetenv TERM %s;\n"; + t = "unset noglob histchars;\n"; } else { - p = "TERM=%s;\nTERMCAP='"; - t = "';\nexport TERMCAP TERM;\n"; + if (tcapbuf) { + p = "TERM=%s;\nTERMCAP="; + t = "export TERMCAP TERM;\n"; + } else { + p = "TERM=%s;\n"; + t = "export TERMCAP;\n"; + } } (void)printf(p, ttype); - wrtermcap(tcapbuf); + if (tcapbuf) { + putchar('\''); + wrtermcap(tcapbuf); + fputs("';\n", stdout); + } (void)printf(t); } |