diff options
Diffstat (limited to 'lib/libterm')
| -rw-r--r-- | lib/libterm/Makefile | 19 | ||||
| -rw-r--r-- | lib/libterm/termcap.3 | 2 | ||||
| -rw-r--r-- | lib/libterm/termcap.c | 4 |
3 files changed, 13 insertions, 12 deletions
diff --git a/lib/libterm/Makefile b/lib/libterm/Makefile index 4c7b0ba012c1..c0ee1c1c90d7 100644 --- a/lib/libterm/Makefile +++ b/lib/libterm/Makefile @@ -1,12 +1,5 @@ -# @(#)Makefile 5.10 (Berkeley) 6/1/90 -# -# PATCHES MAGIC LEVEL PATCH THAT GOT US HERE -# -------------------- ----- ---------------------- -# CURRENT PATCH LEVEL: 1 00138 -# -------------------- ----- ---------------------- -# -# 11 Apr 93 Rodney W. Grimes Added conditional for profiled -# library LINKS +# from: @(#)Makefile 5.10 (Berkeley) 6/1/90 +# $Id: Makefile,v 1.6 1994/02/05 13:19:00 rgrimes Exp $ LIB= termcap CFLAGS+=-DCM_N -DCM_GT -DCM_B -DCM_D @@ -22,3 +15,11 @@ LINKS+= ${LIBDIR}/libtermcap_p.a ${LIBDIR}/libtermlib_p.a .endif .include <bsd.lib.mk> + +# This must be after the .include, otherwise we do not pick up +# the SHLIB_{MAJOR,MINOR}! +# +.if !defined(NOPIC) && defined(SHLIB_MAJOR) && defined(SHLIB_MINOR) +LINKS+= ${LIBDIR}/libtermcap.so.${SHLIB_MAJOR}.${SHLIB_MINOR} \ + ${LIBDIR}/libtermlib.so.${SHLIB_MAJOR}.${SHLIB_MINOR} +.endif diff --git a/lib/libterm/termcap.3 b/lib/libterm/termcap.3 index e708fce378ec..f11507db942d 100644 --- a/lib/libterm/termcap.3 +++ b/lib/libterm/termcap.3 @@ -51,7 +51,7 @@ .Fn tgetnum "char *id" .Fn tgetflag "char *id" .Ft char * -.Fn tgetstr "char *id" "char *area" +.Fn tgetstr "char *id" "char **area" .Ft char * .Fn tgoto "char *cm" destcol destline .Fn tputs "register char *cp" "int affcnt" "int (*outc)()" diff --git a/lib/libterm/termcap.c b/lib/libterm/termcap.c index 36638a6786a3..8ea65665ccce 100644 --- a/lib/libterm/termcap.c +++ b/lib/libterm/termcap.c @@ -62,9 +62,9 @@ static int hopcount; /* detect infinite loops in termcap, init 0 */ static char pathbuf[PBUFSIZ]; /* holds raw path of filenames */ static char *pathvec[PVECSIZ]; /* to point to names in pathbuf */ static char **pvec; /* holds usable tail of path vector */ -char *tskip(); +static char *tskip(); +static char *tdecode(); char *tgetstr(); -char *tdecode(); char *getenv(); /* |