Module Name: othersrc
Committed By: lukem
Date: Mon Feb 1 09:54:10 UTC 2016
Modified Files:
othersrc/usr.bin/tnftp/libedit: chartype.c keymacro.c terminal.c
Log Message:
adapt to tnftp build
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r1.2 othersrc/usr.bin/tnftp/libedit/chartype.c \
othersrc/usr.bin/tnftp/libedit/keymacro.c \
othersrc/usr.bin/tnftp/libedit/terminal.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: othersrc/usr.bin/tnftp/libedit/chartype.c
diff -u othersrc/usr.bin/tnftp/libedit/chartype.c:1.1.1.1 othersrc/usr.bin/tnftp/libedit/chartype.c:1.2
--- othersrc/usr.bin/tnftp/libedit/chartype.c:1.1.1.1 Sun Jan 31 07:11:58 2016
+++ othersrc/usr.bin/tnftp/libedit/chartype.c Mon Feb 1 09:54:10 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: chartype.c,v 1.1.1.1 2016/01/31 07:11:58 lukem Exp $ */
+/* $NetBSD: chartype.c,v 1.2 2016/02/01 09:54:10 lukem Exp $ */
/* from NetBSD: chartype.c,v 1.12 2015/02/22 02:16:19 christos Exp */
/*-
@@ -38,11 +38,18 @@
* chartype.c: character classification and meta information
*/
#include "config.h"
+
+#if 0 /* tnftp */
#if !defined(lint) && !defined(SCCSID)
__RCSID(" NetBSD: chartype.c,v 1.12 2015/02/22 02:16:19 christos Exp ");
#endif /* not lint && not SCCSID */
+#endif /* tnftp */
+
#include "el.h"
+
+#if 0 /* tnftp */
#include <stdlib.h>
+#endif /* tnftp */
#define CT_BUFSIZ ((size_t)1024)
Index: othersrc/usr.bin/tnftp/libedit/keymacro.c
diff -u othersrc/usr.bin/tnftp/libedit/keymacro.c:1.1.1.1 othersrc/usr.bin/tnftp/libedit/keymacro.c:1.2
--- othersrc/usr.bin/tnftp/libedit/keymacro.c:1.1.1.1 Sun Jan 31 07:11:58 2016
+++ othersrc/usr.bin/tnftp/libedit/keymacro.c Mon Feb 1 09:54:10 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: keymacro.c,v 1.1.1.1 2016/01/31 07:11:58 lukem Exp $ */
+/* $NetBSD: keymacro.c,v 1.2 2016/02/01 09:54:10 lukem Exp $ */
/* from NetBSD: keymacro.c,v 1.7 2011/08/16 16:25:15 christos Exp */
/*-
@@ -34,6 +34,8 @@
*/
#include "config.h"
+
+#if 0 /* tnftp */
#if !defined(lint) && !defined(SCCSID)
#if 0
static char sccsid[] = "@(#)key.c 8.1 (Berkeley) 6/4/93";
@@ -41,6 +43,7 @@ static char sccsid[] = "@(#)key.c 8.1 (B
__RCSID(" NetBSD: keymacro.c,v 1.7 2011/08/16 16:25:15 christos Exp ");
#endif
#endif /* not lint && not SCCSID */
+#endif /* tnftp */
/*
* keymacro.c: This module contains the procedures for maintaining
@@ -64,8 +67,10 @@ __RCSID(" NetBSD: keymacro.c,v 1.7 2011/
* 1) It is not possible to have one key that is a
* substr of another.
*/
+#if 0 /* tnftp */
#include <string.h>
#include <stdlib.h>
+#endif /* tnftp */
#include "el.h"
Index: othersrc/usr.bin/tnftp/libedit/terminal.c
diff -u othersrc/usr.bin/tnftp/libedit/terminal.c:1.1.1.1 othersrc/usr.bin/tnftp/libedit/terminal.c:1.2
--- othersrc/usr.bin/tnftp/libedit/terminal.c:1.1.1.1 Sun Jan 31 07:11:57 2016
+++ othersrc/usr.bin/tnftp/libedit/terminal.c Mon Feb 1 09:54:10 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: terminal.c,v 1.1.1.1 2016/01/31 07:11:57 lukem Exp $ */
+/* $NetBSD: terminal.c,v 1.2 2016/02/01 09:54:10 lukem Exp $ */
/* from NetBSD: terminal.c,v 1.14 2012/05/30 18:21:14 christos Exp */
/*-
@@ -34,6 +34,8 @@
*/
#include "config.h"
+
+#if 0 /* tnftp */
#if !defined(lint) && !defined(SCCSID)
#if 0
static char sccsid[] = "@(#)term.c 8.2 (Berkeley) 4/30/95";
@@ -41,12 +43,14 @@ static char sccsid[] = "@(#)term.c 8.2 (
__RCSID(" NetBSD: terminal.c,v 1.14 2012/05/30 18:21:14 christos Exp ");
#endif
#endif /* not lint && not SCCSID */
+#endif /* tnftp */
/*
* terminal.c: Editor/termcap-curses interface
* We have to declare a static variable here, since the
* termcap putchar routine does not take an argument!
*/
+#if 0 /* tnftp */
#include <stdio.h>
#include <signal.h>
#include <string.h>
@@ -73,6 +77,7 @@ __RCSID(" NetBSD: terminal.c,v 1.14 2012
#ifdef _REENTRANT
#include <pthread.h>
#endif
+#endif /* tnftp */
#include "el.h"
