From 4b819fa20a8d007a10f2d3e8d6a5dedf7f18fc9a Mon Sep 17 00:00:00 2001 From: Xin LI Date: Fri, 28 Feb 2014 19:12:44 +0000 Subject: Undo two previous imports which was never done in preparation of doing a new import. --- ncurses/tinfo/read_termcap.c | 20 ++++++++------------ 1 file changed, 8 insertions(+), 12 deletions(-) (limited to 'ncurses/tinfo/read_termcap.c') diff --git a/ncurses/tinfo/read_termcap.c b/ncurses/tinfo/read_termcap.c index b39a5bebaa47..d94d1a42466d 100644 --- a/ncurses/tinfo/read_termcap.c +++ b/ncurses/tinfo/read_termcap.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright (c) 1998-2009,2010 Free Software Foundation, Inc. * + * Copyright (c) 1998-2005,2006 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * * copy of this software and associated documentation files (the * @@ -56,8 +56,9 @@ #include #include #include +#include -MODULE_ID("$Id: read_termcap.c,v 1.74 2010/01/23 17:57:43 tom Exp $") +MODULE_ID("$Id: read_termcap.c,v 1.71 2006/07/29 12:06:51 tom Exp $") #if !PURE_TERMINFO @@ -78,15 +79,6 @@ get_termpath(void) return result; } -/* - * Note: - * getcap(), cgetent(), etc., are BSD functions. A copy of those was added to - * this file in November 1995, derived from the BSD4.4 Lite sources. - * - * The initial adaptation uses 518 lines from that source. - * The current source (in 2009) uses 183 lines of BSD4.4 Lite (441 ignoring - * whitespace). - */ #if USE_GETCAP #if HAVE_BSD_CGETENT @@ -115,7 +107,11 @@ static int _nc_nfcmp(const char *, char *); * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * 3. Neither the name of the University nor the names of its contributors + * 3. All advertising materials mentioning features or use of this software + * must display the following acknowledgment: + * This product includes software developed by the University of + * California, Berkeley and its contributors. + * 4. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * -- cgit v1.2.3