diff options
Diffstat (limited to 'lib/termcap')
| -rw-r--r-- | lib/termcap/Makefile.in | 23 | ||||
| -rw-r--r-- | lib/termcap/grot/COPYING | 12 | ||||
| -rw-r--r-- | lib/termcap/grot/Makefile.in | 2 | ||||
| -rw-r--r-- | lib/termcap/grot/termcap.texi | 3 | ||||
| -rw-r--r-- | lib/termcap/ltcap.h | 29 | ||||
| -rw-r--r-- | lib/termcap/termcap.c | 30 | ||||
| -rw-r--r-- | lib/termcap/termcap.h | 2 | ||||
| -rw-r--r-- | lib/termcap/tparam.c | 20 | ||||
| -rw-r--r-- | lib/termcap/version.c | 2 |
9 files changed, 105 insertions, 18 deletions
diff --git a/lib/termcap/Makefile.in b/lib/termcap/Makefile.in index d5d33bc0..1ed2c275 100644 --- a/lib/termcap/Makefile.in +++ b/lib/termcap/Makefile.in @@ -4,6 +4,22 @@ # # #################################################################### +# Copyright (C) 1996 Free Software Foundation, Inc. + +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2, or (at your option) +# any later version. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. + +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111 USA. + srcdir = @srcdir@ VPATH = .:@srcdir@ topdir = @top_srcdir@ @@ -29,7 +45,7 @@ LDFLAGS = @LDFLAGS@ DEFS = @DEFS@ -INCLUDES = -I. -I../.. -I$(topdir) -I$(topdir)/lib +INCLUDES = -I. -I../.. -I$(topdir) -I$(topdir)/lib -I$(srcdir) CCFLAGS = $(CFLAGS) $(DEFS) $(CPPFLAGS) ${INCLUDES} @@ -59,7 +75,10 @@ install: clean: $(RM) *.o *.a *.log *.cp *.tp *.vr *.fn *.aux *.pg *.toc -mostlyclean distclean maintainer-clean: clean +mostlyclean: clean + +distclean maintainer-clean: clean + $(RM) Makefile $(DESTDIR)/libtermcap.a: libtermcap.a ${INSTALL_DATA} -c -m 644 libtermcap.a $@ diff --git a/lib/termcap/grot/COPYING b/lib/termcap/grot/COPYING index a43ea212..2b940a41 100644 --- a/lib/termcap/grot/COPYING +++ b/lib/termcap/grot/COPYING @@ -2,10 +2,18 @@ Version 2, June 1991 Copyright (C) 1989, 1991 Free Software Foundation, Inc. - 675 Mass Ave, Cambridge, MA 02139, USA + 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed. +The Free Software Foundation has exempted Bash from the requirement of +Paragraph 2c of the General Public License. This is to say, there is +no requirement for Bash to print a notice when it is started +interactively in the usual way. We made this exception because users +and standards expect shells not to print such messages. This +exception applies to any program that serves as a shell and that is +based primarily on Bash as opposed to other GNU software. + Preamble The licenses for most software are designed to take away your @@ -305,7 +313,7 @@ the "copyright" line and a pointer to where the full notice is found. You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA Also add information on how to contact you by electronic and paper mail. diff --git a/lib/termcap/grot/Makefile.in b/lib/termcap/grot/Makefile.in index 66e5d02f..e6f06ae6 100644 --- a/lib/termcap/grot/Makefile.in +++ b/lib/termcap/grot/Makefile.in @@ -13,7 +13,7 @@ # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software -# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111 USA. #### Start of system configuration section. #### diff --git a/lib/termcap/grot/termcap.texi b/lib/termcap/grot/termcap.texi index 7a6cd565..eab49e88 100644 --- a/lib/termcap/grot/termcap.texi +++ b/lib/termcap/grot/termcap.texi @@ -61,7 +61,7 @@ by the Foundation. Copyright @copyright{} 1988 Free Software Foundation, Inc. Published by the Free Software Foundation -(675 Mass Ave, Cambridge MA 02139). +(59 Temple Place, Suite 330, Boston, MA 02111 USA). Printed copies are available for $10 each. Permission is granted to make and distribute verbatim copies of @@ -3615,4 +3615,3 @@ Flag: Teleray 1061; several strange characteristics. @contents @bye - diff --git a/lib/termcap/ltcap.h b/lib/termcap/ltcap.h new file mode 100644 index 00000000..507481f0 --- /dev/null +++ b/lib/termcap/ltcap.h @@ -0,0 +1,29 @@ +/* Local declarations for termcap library. + Copyright (C) 1999 Free Software Foundation, Inc. + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2, or (at your option) + any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111 USA. */ + +#ifndef _LTCAP_H_ +#define _LTCAP_H_ 1 + +#if !defined (__APPLE__) +# define __private_extern__ +#endif + +#ifndef MAX_TGETENT_BUFSIZ +# define MAX_TGETENT_BUFSIZ 2048 +#endif + +#endif /* _LTCAP_H_ */ diff --git a/lib/termcap/termcap.c b/lib/termcap/termcap.c index eb690c9f..eaf94713 100644 --- a/lib/termcap/termcap.c +++ b/lib/termcap/termcap.c @@ -12,8 +12,8 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License -along with this program; see the file COPYING. If not, write to -the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */ +along with this program; see the file COPYING. If not, write to the +Free Software Foundation, 59 Temple Place, Suite 330, Boston, MA 02111 USA. */ /* Emacs config.h may rename various library functions such as malloc. */ #ifdef HAVE_CONFIG_H @@ -27,6 +27,14 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */ #include <fcntl.h> +#ifdef HAVE_STDLIB_H +# include <stdlib.h> +#else +extern char *getenv (); +extern char *malloc (); +extern char *realloc (); +#endif + #else /* not HAVE_CONFIG_H */ #ifdef STDC_HEADERS @@ -77,6 +85,8 @@ int bufsize = 128; #endif #endif +#include "ltcap.h" + #ifndef TERMCAP_FILE #define TERMCAP_FILE "/etc/termcap" #endif @@ -137,6 +147,7 @@ find_capability (bp, cap) return NULL; } +__private_extern__ int tgetnum (cap) char *cap; @@ -147,6 +158,7 @@ tgetnum (cap) return atoi (ptr); } +__private_extern__ int tgetflag (cap) char *cap; @@ -160,6 +172,7 @@ tgetflag (cap) to store the string. That pointer is advanced over the space used. If AREA is null, space is allocated with `malloc'. */ +__private_extern__ char * tgetstr (cap, area) char *cap; @@ -264,7 +277,7 @@ tgetst1 (ptr, area) short ospeed; /* If OSPEED is 0, we use this as the actual baud rate. */ int tputs_baud_rate; -char PC; +__private_extern__ char PC = '\0'; /* Actual baud rate if positive; - baud rate / 100 if negative. */ @@ -280,6 +293,7 @@ static int speeds[] = #endif /* not VMS */ }; +__private_extern__ void tputs (str, nlines, outfun) register char *str; @@ -299,8 +313,10 @@ tputs (str, nlines, outfun) #else if (ospeed == 0) speed = tputs_baud_rate; - else + else if (ospeed > 0 && ospeed < (sizeof speeds / sizeof speeds[0])) speed = speeds[ospeed]; + else + speed = 0; #endif if (!str) @@ -393,7 +409,8 @@ static int valid_filename_p (fn) char *fn; { - return *fn == '/' || fn[1] == ':'; + return *fn == '\\' || *fn == '/' || + (*fn >= 'A' && *fn <= 'z' && fn[1] == ':'); } #else #define valid_filename_p(fn) (*(fn) == '/') @@ -412,6 +429,7 @@ valid_filename_p (fn) 0 if the data base is accessible but the type NAME is not defined in it, and some other value otherwise. */ +__private_extern__ int tgetent (bp, name) char *bp, *name; @@ -452,12 +470,14 @@ tgetent (bp, name) termcap_name = getenv ("TERMCAP"); if (termcap_name && *termcap_name == '\0') termcap_name = NULL; +#if 0 #if defined (MSDOS) && !defined (TEST) if (termcap_name && (*termcap_name == '\\' || *termcap_name == '/' || termcap_name[1] == ':')) dostounix_filename(termcap_name); #endif +#endif filep = termcap_name && valid_filename_p (termcap_name); diff --git a/lib/termcap/termcap.h b/lib/termcap/termcap.h index b19fb0a1..40c2e298 100644 --- a/lib/termcap/termcap.h +++ b/lib/termcap/termcap.h @@ -13,7 +13,7 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111 USA. */ #ifndef _TERMCAP_H #define _TERMCAP_H 1 diff --git a/lib/termcap/tparam.c b/lib/termcap/tparam.c index 24702899..1c83f045 100644 --- a/lib/termcap/tparam.c +++ b/lib/termcap/tparam.c @@ -12,12 +12,21 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License -along with this program; see the file COPYING. If not, write to -the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */ +along with this program; see the file COPYING. If not, write to the +Free Software Foundation, 59 Temple Place, Suite 330, Boston, MA 02111 USA. */ /* Emacs config.h may rename various library functions such as malloc. */ #ifdef HAVE_CONFIG_H #include <config.h> + +#ifdef HAVE_STDLIB_H +# include <stdlib.h> +#else +extern char *getenv (); +extern char *malloc (); +extern char *realloc (); +#endif + #else /* not HAVE_CONFIG_H */ #if defined(HAVE_STRING_H) || defined(STDC_HEADERS) @@ -34,6 +43,8 @@ char *realloc (); #endif /* not HAVE_CONFIG_H */ +#include "ltcap.h" + #ifndef NULL #define NULL (char *) 0 #endif @@ -101,11 +112,12 @@ tparam (string, outstring, len, arg0, arg1, arg2, arg3) return tparam1 (string, outstring, len, NULL, NULL, arg); } -char *BC; -char *UP; +__private_extern__ char *BC; +__private_extern__ char *UP; static char tgoto_buf[50]; +__private_extern__ char * tgoto (cm, hpos, vpos) char *cm; diff --git a/lib/termcap/version.c b/lib/termcap/version.c index f5623a27..be7d9e75 100644 --- a/lib/termcap/version.c +++ b/lib/termcap/version.c @@ -1,2 +1,2 @@ /* Make the library identifiable with the RCS ident command. */ -static char *version_string = "\n$Version: GNU termcap 1.3 $\n"; +static char *termcap_version_string = "\n$Version: GNU termcap 1.3 $\n"; |