summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorpeter <peter@FreeBSD.org>1998-12-16 06:04:29 +0000
committerpeter <peter@FreeBSD.org>1998-12-16 06:04:29 +0000
commit4b96ed957d155bec106e538292e28cae1bd1b893 (patch)
tree87f2abac56b02a4135b980720395990b19e3a1af
parentf3847d7306c4d9634b4205fb2f31c81f3b30df90 (diff)
downloadFreeBSD-src-4b96ed957d155bec106e538292e28cae1bd1b893.zip
FreeBSD-src-4b96ed957d155bec106e538292e28cae1bd1b893.tar.gz
Old stuff laying around: Don't use a function called getstr(), that has
nasty consequences when the system curses is ncurses as this conflicts with a ncurses funciton and causes recursion.
-rw-r--r--lib/libtelnet/getent.c2
-rw-r--r--libexec/telnetd/telnetd.c12
2 files changed, 7 insertions, 7 deletions
diff --git a/lib/libtelnet/getent.c b/lib/libtelnet/getent.c
index e87bf66..0956a2a 100644
--- a/lib/libtelnet/getent.c
+++ b/lib/libtelnet/getent.c
@@ -58,7 +58,7 @@ char *cp, *name;
#ifndef SOLARIS
/*ARGSUSED*/
char *
-getstr(id, cpp)
+Getstr(id, cpp)
char *id, **cpp;
{
# ifdef HAS_CGETENT
diff --git a/libexec/telnetd/telnetd.c b/libexec/telnetd/telnetd.c
index 7018fdc..37564e3 100644
--- a/libexec/telnetd/telnetd.c
+++ b/libexec/telnetd/telnetd.c
@@ -42,7 +42,7 @@ static const char copyright[] =
static char sccsid[] = "@(#)telnetd.c 8.2 (Berkeley) 12/15/93";
#endif
static const char rcsid[] =
- "$Id: telnetd.c,v 1.13 1997/12/03 07:16:05 charnier Exp $";
+ "$Id: telnetd.c,v 1.14 1998/04/26 06:51:36 phk Exp $";
#endif /* not lint */
#include "telnetd.h"
@@ -1091,13 +1091,13 @@ telnet(f, p, host)
#endif
if (getent(defent, "default") == 1) {
- char *getstr();
+ char *Getstr();
char *cp=defstrs;
- HE = getstr("he", &cp);
- HN = getstr("hn", &cp);
- IM = getstr("im", &cp);
- IF = getstr("if", &cp);
+ HE = Getstr("he", &cp);
+ HN = Getstr("hn", &cp);
+ IM = Getstr("im", &cp);
+ IF = Getstr("if", &cp);
if (HN && *HN)
(void) strcpy(host_name, HN);
if (IF && (if_fd = open(IF, O_RDONLY, 000)) != -1)
OpenPOWER on IntegriCloud