Module Name: othersrc
Committed By: lukem
Date: Mon Feb 1 10:29:24 UTC 2016
Modified Files:
othersrc/usr.bin/tnftp/libedit: chared.c chared.h common.c config.h
el.c el.h emacs.c filecomplete.c hist.c histedit.h history.c map.c
parse.c prompt.c read.c readline.c refresh.c search.c sig.h sys.h
tokenizer.c tty.c tty.h vi.c
othersrc/usr.bin/tnftp/libedit/readline: readline.h
Log Message:
Reduce differences with upstream libedit
Adjust to #if 0 out #includes of system headers and other
tests that are handled by "tnftp.h" as included by "config.h"
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 othersrc/usr.bin/tnftp/libedit/chared.c \
othersrc/usr.bin/tnftp/libedit/parse.c \
othersrc/usr.bin/tnftp/libedit/vi.c
cvs rdiff -u -r1.3 -r1.4 othersrc/usr.bin/tnftp/libedit/chared.h \
othersrc/usr.bin/tnftp/libedit/el.h othersrc/usr.bin/tnftp/libedit/sig.h
cvs rdiff -u -r1.6 -r1.7 othersrc/usr.bin/tnftp/libedit/common.c \
othersrc/usr.bin/tnftp/libedit/el.c \
othersrc/usr.bin/tnftp/libedit/emacs.c \
othersrc/usr.bin/tnftp/libedit/hist.c \
othersrc/usr.bin/tnftp/libedit/history.c \
othersrc/usr.bin/tnftp/libedit/map.c \
othersrc/usr.bin/tnftp/libedit/prompt.c \
othersrc/usr.bin/tnftp/libedit/readline.c \
othersrc/usr.bin/tnftp/libedit/refresh.c \
othersrc/usr.bin/tnftp/libedit/search.c \
othersrc/usr.bin/tnftp/libedit/tokenizer.c
cvs rdiff -u -r1.4 -r1.5 othersrc/usr.bin/tnftp/libedit/config.h \
othersrc/usr.bin/tnftp/libedit/filecomplete.c \
othersrc/usr.bin/tnftp/libedit/histedit.h \
othersrc/usr.bin/tnftp/libedit/tty.h
cvs rdiff -u -r1.8 -r1.9 othersrc/usr.bin/tnftp/libedit/read.c \
othersrc/usr.bin/tnftp/libedit/tty.c
cvs rdiff -u -r1.5 -r1.6 othersrc/usr.bin/tnftp/libedit/sys.h
cvs rdiff -u -r1.5 -r1.6 othersrc/usr.bin/tnftp/libedit/readline/readline.h
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/chared.c
diff -u othersrc/usr.bin/tnftp/libedit/chared.c:1.7 othersrc/usr.bin/tnftp/libedit/chared.c:1.8
--- othersrc/usr.bin/tnftp/libedit/chared.c:1.7 Sun Jan 31 08:43:50 2016
+++ othersrc/usr.bin/tnftp/libedit/chared.c Mon Feb 1 10:29:24 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: chared.c,v 1.7 2016/01/31 08:43:50 lukem Exp $ */
+/* $NetBSD: chared.c,v 1.8 2016/02/01 10:29:24 lukem Exp $ */
/* from NetBSD: chared.c,v 1.40 2014/06/18 18:12:28 christos Exp */
/*-
@@ -33,11 +33,9 @@
* SUCH DAMAGE.
*/
-#include "tnftp.h"
-#include "sys.h"
-
-#if 0
#include "config.h"
+
+#if 0 /* tnftp */
#if !defined(lint) && !defined(SCCSID)
#if 0
static char sccsid[] = "@(#)chared.c 8.1 (Berkeley) 6/4/93";
@@ -45,12 +43,15 @@ static char sccsid[] = "@(#)chared.c 8.1
__RCSID(" NetBSD: chared.c,v 1.40 2014/06/18 18:12:28 christos Exp ");
#endif
#endif /* not lint && not SCCSID */
-#endif
+#endif /* tnftp */
/*
* chared.c: Character editor utilities
*/
+#if 0 /* tnftp */
#include <stdlib.h>
+#endif /* tnftp */
+
#include "el.h"
private void ch__clearmacro (EditLine *);
Index: othersrc/usr.bin/tnftp/libedit/parse.c
diff -u othersrc/usr.bin/tnftp/libedit/parse.c:1.7 othersrc/usr.bin/tnftp/libedit/parse.c:1.8
--- othersrc/usr.bin/tnftp/libedit/parse.c:1.7 Sun Jan 31 08:43:50 2016
+++ othersrc/usr.bin/tnftp/libedit/parse.c Mon Feb 1 10:29:24 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: parse.c,v 1.7 2016/01/31 08:43:50 lukem Exp $ */
+/* $NetBSD: parse.c,v 1.8 2016/02/01 10:29:24 lukem Exp $ */
/* from NetBSD: parse.c,v 1.27 2014/07/06 18:15:34 christos Exp */
/*-
@@ -33,11 +33,9 @@
* SUCH DAMAGE.
*/
-#include "tnftp.h"
-#include "sys.h"
-
-#if 0
#include "config.h"
+
+#if 0 /* tnftp */
#if !defined(lint) && !defined(SCCSID)
#if 0
static char sccsid[] = "@(#)parse.c 8.1 (Berkeley) 6/4/93";
@@ -45,7 +43,7 @@ static char sccsid[] = "@(#)parse.c 8.1
__RCSID(" NetBSD: parse.c,v 1.27 2014/07/06 18:15:34 christos Exp ");
#endif
#endif /* not lint && not SCCSID */
-#endif
+#endif /* tnftp */
/*
* parse.c: parse an editline extended command
@@ -61,7 +59,10 @@ __RCSID(" NetBSD: parse.c,v 1.27 2014/07
* setty
*/
#include "el.h"
+
+#if 0 /* tnftp */
#include <stdlib.h>
+#endif /* tnftp */
private const struct {
const Char *name;
Index: othersrc/usr.bin/tnftp/libedit/vi.c
diff -u othersrc/usr.bin/tnftp/libedit/vi.c:1.7 othersrc/usr.bin/tnftp/libedit/vi.c:1.8
--- othersrc/usr.bin/tnftp/libedit/vi.c:1.7 Sun Jan 31 08:43:50 2016
+++ othersrc/usr.bin/tnftp/libedit/vi.c Mon Feb 1 10:29:24 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: vi.c,v 1.7 2016/01/31 08:43:50 lukem Exp $ */
+/* $NetBSD: vi.c,v 1.8 2016/02/01 10:29:24 lukem Exp $ */
/* from NetBSD: vi.c,v 1.47 2015/10/21 21:45:30 christos Exp */
/*-
@@ -33,11 +33,9 @@
* SUCH DAMAGE.
*/
-#include "tnftp.h"
-#include "sys.h"
-
-#if 0
#include "config.h"
+
+#if 0 /* tnftp */
#include <stdlib.h>
#include <unistd.h>
#include <limits.h>
@@ -50,7 +48,7 @@ static char sccsid[] = "@(#)vi.c 8.1 (Be
__RCSID(" NetBSD: vi.c,v 1.47 2015/10/21 21:45:30 christos Exp ");
#endif
#endif /* not lint && not SCCSID */
-#endif
+#endif /* tnftp */
/*
* vi.c: Vi mode commands.
Index: othersrc/usr.bin/tnftp/libedit/chared.h
diff -u othersrc/usr.bin/tnftp/libedit/chared.h:1.3 othersrc/usr.bin/tnftp/libedit/chared.h:1.4
--- othersrc/usr.bin/tnftp/libedit/chared.h:1.3 Sun Jan 31 08:43:50 2016
+++ othersrc/usr.bin/tnftp/libedit/chared.h Mon Feb 1 10:29:24 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: chared.h,v 1.3 2016/01/31 08:43:50 lukem Exp $ */
+/* $NetBSD: chared.h,v 1.4 2016/02/01 10:29:24 lukem Exp $ */
/* from NetBSD: chared.h,v 1.22 2014/06/18 18:12:28 christos Exp */
/*-
@@ -41,8 +41,10 @@
#ifndef _h_el_chared
#define _h_el_chared
+#if 0 /* tnftp */
#include <ctype.h>
#include <string.h>
+#endif /* tnftp */
#include "histedit.h"
Index: othersrc/usr.bin/tnftp/libedit/el.h
diff -u othersrc/usr.bin/tnftp/libedit/el.h:1.3 othersrc/usr.bin/tnftp/libedit/el.h:1.4
--- othersrc/usr.bin/tnftp/libedit/el.h:1.3 Sun Jan 31 08:43:50 2016
+++ othersrc/usr.bin/tnftp/libedit/el.h Mon Feb 1 10:29:24 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: el.h,v 1.3 2016/01/31 08:43:50 lukem Exp $ */
+/* $NetBSD: el.h,v 1.4 2016/02/01 10:29:24 lukem Exp $ */
/* from NetBSD: el.h,v 1.25 2011/07/29 23:44:44 christos Exp */
/*-
@@ -49,8 +49,11 @@
#include "histedit.h"
#include "chartype.h"
+
+#if 0 /* tnftp */
#include <stdio.h>
#include <sys/types.h>
+#endif /* tnftp */
#define EL_BUFSIZ ((size_t)1024) /* Maximum line size */
Index: othersrc/usr.bin/tnftp/libedit/sig.h
diff -u othersrc/usr.bin/tnftp/libedit/sig.h:1.3 othersrc/usr.bin/tnftp/libedit/sig.h:1.4
--- othersrc/usr.bin/tnftp/libedit/sig.h:1.3 Sun Jan 31 08:43:50 2016
+++ othersrc/usr.bin/tnftp/libedit/sig.h Mon Feb 1 10:29:24 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: sig.h,v 1.3 2016/01/31 08:43:50 lukem Exp $ */
+/* $NetBSD: sig.h,v 1.4 2016/02/01 10:29:24 lukem Exp $ */
/* from NetBSD: sig.h,v 1.8 2009/02/19 15:20:22 christos Exp */
/*-
@@ -41,7 +41,9 @@
#ifndef _h_el_sig
#define _h_el_sig
+#if 0 /* tnftp */
#include <signal.h>
+#endif /* tnftp */
#include "histedit.h"
Index: othersrc/usr.bin/tnftp/libedit/common.c
diff -u othersrc/usr.bin/tnftp/libedit/common.c:1.6 othersrc/usr.bin/tnftp/libedit/common.c:1.7
--- othersrc/usr.bin/tnftp/libedit/common.c:1.6 Sun Jan 31 08:43:50 2016
+++ othersrc/usr.bin/tnftp/libedit/common.c Mon Feb 1 10:29:24 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: common.c,v 1.6 2016/01/31 08:43:50 lukem Exp $ */
+/* $NetBSD: common.c,v 1.7 2016/02/01 10:29:24 lukem Exp $ */
/* from NetBSD: common.c,v 1.29 2012/03/24 20:08:43 christos Exp */
/*-
@@ -33,11 +33,9 @@
* SUCH DAMAGE.
*/
-#include "tnftp.h"
-#include "sys.h"
-
-#if 0
#include "config.h"
+
+#if 0 /* tnftp */
#if !defined(lint) && !defined(SCCSID)
#if 0
static char sccsid[] = "@(#)common.c 8.1 (Berkeley) 6/4/93";
@@ -45,7 +43,7 @@ static char sccsid[] = "@(#)common.c 8.1
__RCSID(" NetBSD: common.c,v 1.29 2012/03/24 20:08:43 christos Exp ");
#endif
#endif /* not lint && not SCCSID */
-#endif
+#endif /* tnftp */
/*
* common.c: Common Editor functions
Index: othersrc/usr.bin/tnftp/libedit/el.c
diff -u othersrc/usr.bin/tnftp/libedit/el.c:1.6 othersrc/usr.bin/tnftp/libedit/el.c:1.7
--- othersrc/usr.bin/tnftp/libedit/el.c:1.6 Sun Jan 31 08:43:50 2016
+++ othersrc/usr.bin/tnftp/libedit/el.c Mon Feb 1 10:29:24 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: el.c,v 1.6 2016/01/31 08:43:50 lukem Exp $ */
+/* $NetBSD: el.c,v 1.7 2016/02/01 10:29:24 lukem Exp $ */
/* from NetBSD: el.c,v 1.74 2015/12/08 12:56:55 christos Exp */
/*-
@@ -33,11 +33,9 @@
* SUCH DAMAGE.
*/
-#include "tnftp.h"
-#include "sys.h"
-
-#if 0
#include "config.h"
+
+#if 0 /* tnftp */
#if !defined(lint) && !defined(SCCSID)
#if 0
static char sccsid[] = "@(#)el.c 8.2 (Berkeley) 1/3/94";
@@ -45,11 +43,12 @@ static char sccsid[] = "@(#)el.c 8.2 (Be
__RCSID(" NetBSD: el.c,v 1.74 2015/12/08 12:56:55 christos Exp ");
#endif
#endif /* not lint && not SCCSID */
-#endif
+#endif /* tnftp */
/*
* el.c: EditLine interface functions
*/
+#if 0 /* tnftp */
#include <sys/types.h>
#include <sys/param.h>
#include <string.h>
@@ -58,6 +57,8 @@ __RCSID(" NetBSD: el.c,v 1.74 2015/12/08
#include <ctype.h>
#include <locale.h>
#include <langinfo.h>
+#endif /* tnftp */
+
#include "el.h"
/* el_init():
@@ -528,10 +529,10 @@ el_source(EditLine *el, const char *fnam
static const char elpath[] = "/.editrc";
size_t plen = sizeof(elpath);
-#if 0 // TNFTP doesn't run setuid
+#if 0 /* tnftp doesn't run setuid */
if (issetugid())
return -1;
-#endif
+#endif /* tnftp */
if ((ptr = getenv("HOME")) == NULL)
return -1;
plen += strlen(ptr);
@@ -539,7 +540,7 @@ el_source(EditLine *el, const char *fnam
return -1;
(void)snprintf(path, plen, "%s%s", ptr, elpath);
fname = path;
-#if 1 // TNFTP doesn't run setuid
+#if 1 /* tnftp doesn't run setuid */
#else
/*
* If issetugid() is missing, always return an error, in order
@@ -547,7 +548,7 @@ el_source(EditLine *el, const char *fnam
* hole.
*/
return -1;
-#endif
+#endif /* tnftp */
}
if (fp == NULL)
fp = fopen(fname, "r");
Index: othersrc/usr.bin/tnftp/libedit/emacs.c
diff -u othersrc/usr.bin/tnftp/libedit/emacs.c:1.6 othersrc/usr.bin/tnftp/libedit/emacs.c:1.7
--- othersrc/usr.bin/tnftp/libedit/emacs.c:1.6 Sun Jan 31 08:43:50 2016
+++ othersrc/usr.bin/tnftp/libedit/emacs.c Mon Feb 1 10:29:24 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: emacs.c,v 1.6 2016/01/31 08:43:50 lukem Exp $ */
+/* $NetBSD: emacs.c,v 1.7 2016/02/01 10:29:24 lukem Exp $ */
/* from NetBSD: emacs.c,v 1.25 2011/07/29 15:16:33 christos Exp */
/*-
@@ -33,11 +33,9 @@
* SUCH DAMAGE.
*/
-#include "tnftp.h"
-#include "sys.h"
-
-#if 0
#include "config.h"
+
+#if 0 /* tnftp */
#if !defined(lint) && !defined(SCCSID)
#if 0
static char sccsid[] = "@(#)emacs.c 8.1 (Berkeley) 6/4/93";
@@ -45,7 +43,7 @@ static char sccsid[] = "@(#)emacs.c 8.1
__RCSID(" NetBSD: emacs.c,v 1.25 2011/07/29 15:16:33 christos Exp ");
#endif
#endif /* not lint && not SCCSID */
-#endif
+#endif /* tnftp */
/*
* emacs.c: Emacs functions
Index: othersrc/usr.bin/tnftp/libedit/hist.c
diff -u othersrc/usr.bin/tnftp/libedit/hist.c:1.6 othersrc/usr.bin/tnftp/libedit/hist.c:1.7
--- othersrc/usr.bin/tnftp/libedit/hist.c:1.6 Sun Jan 31 08:43:50 2016
+++ othersrc/usr.bin/tnftp/libedit/hist.c Mon Feb 1 10:29:24 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: hist.c,v 1.6 2016/01/31 08:43:50 lukem Exp $ */
+/* $NetBSD: hist.c,v 1.7 2016/02/01 10:29:24 lukem Exp $ */
/* from NetBSD: hist.c,v 1.20 2011/07/29 15:16:33 christos Exp */
/*-
@@ -33,11 +33,9 @@
* SUCH DAMAGE.
*/
-#include "tnftp.h"
-#include "sys.h"
-
-#if 0
#include "config.h"
+
+#if 0 /* tnftp */
#if !defined(lint) && !defined(SCCSID)
#if 0
static char sccsid[] = "@(#)hist.c 8.1 (Berkeley) 6/4/93";
@@ -45,12 +43,15 @@ static char sccsid[] = "@(#)hist.c 8.1 (
__RCSID(" NetBSD: hist.c,v 1.20 2011/07/29 15:16:33 christos Exp ");
#endif
#endif /* not lint && not SCCSID */
-#endif
+#endif /* tnftp */
/*
* hist.c: History access functions
*/
+#if 0 /* tnftp */
#include <stdlib.h>
+#endif /* tnftp */
+
#include "el.h"
/* hist_init():
Index: othersrc/usr.bin/tnftp/libedit/history.c
diff -u othersrc/usr.bin/tnftp/libedit/history.c:1.6 othersrc/usr.bin/tnftp/libedit/history.c:1.7
--- othersrc/usr.bin/tnftp/libedit/history.c:1.6 Sun Jan 31 08:43:50 2016
+++ othersrc/usr.bin/tnftp/libedit/history.c Mon Feb 1 10:29:24 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: history.c,v 1.6 2016/01/31 08:43:50 lukem Exp $ */
+/* $NetBSD: history.c,v 1.7 2016/02/01 10:29:24 lukem Exp $ */
/* from NetBSD: history.c,v 1.47 2014/05/11 01:05:17 christos Exp */
/*-
@@ -33,12 +33,9 @@
* SUCH DAMAGE.
*/
-
-#include "tnftp.h"
-#include "sys.h"
-
-#if 0
#include "config.h"
+
+#if 0 /* tnftp */
#if !defined(lint) && !defined(SCCSID)
#if 0
static char sccsid[] = "@(#)history.c 8.1 (Berkeley) 6/4/93";
@@ -46,18 +43,18 @@ static char sccsid[] = "@(#)history.c 8.
__RCSID(" NetBSD: history.c,v 1.47 2014/05/11 01:05:17 christos Exp ");
#endif
#endif /* not lint && not SCCSID */
-#endif
+#endif /* tnftp */
/*
* hist.c: TYPE(History) access functions
*/
+#if 0 /* tnftp */
#include <string.h>
#include <stdlib.h>
#include <stdarg.h>
-#if 0
#include <vis.h>
-#endif
#include <sys/stat.h>
+#endif /* tnftp */
static const char hist_cookie[] = "_HiStOrY_V2_\n";
Index: othersrc/usr.bin/tnftp/libedit/map.c
diff -u othersrc/usr.bin/tnftp/libedit/map.c:1.6 othersrc/usr.bin/tnftp/libedit/map.c:1.7
--- othersrc/usr.bin/tnftp/libedit/map.c:1.6 Sun Jan 31 08:43:50 2016
+++ othersrc/usr.bin/tnftp/libedit/map.c Mon Feb 1 10:29:24 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: map.c,v 1.6 2016/01/31 08:43:50 lukem Exp $ */
+/* $NetBSD: map.c,v 1.7 2016/02/01 10:29:24 lukem Exp $ */
/* from NetBSD: map.c,v 1.35 2015/05/14 10:44:15 christos Exp */
/*-
@@ -33,11 +33,9 @@
* SUCH DAMAGE.
*/
-#include "tnftp.h"
-#include "sys.h"
-
-#if 0
#include "config.h"
+
+#if 0 /* tnftp */
#if !defined(lint) && !defined(SCCSID)
#if 0
static char sccsid[] = "@(#)map.c 8.1 (Berkeley) 6/4/93";
@@ -45,12 +43,15 @@ static char sccsid[] = "@(#)map.c 8.1 (B
__RCSID(" NetBSD: map.c,v 1.35 2015/05/14 10:44:15 christos Exp ");
#endif
#endif /* not lint && not SCCSID */
-#endif
+#endif /* tnftp */
/*
* map.c: Editor function definitions
*/
+#if 0 /* tnftp */
#include <stdlib.h>
+#endif /* tnftp */
+
#include "el.h"
private void map_print_key(EditLine *, el_action_t *, const Char *);
Index: othersrc/usr.bin/tnftp/libedit/prompt.c
diff -u othersrc/usr.bin/tnftp/libedit/prompt.c:1.6 othersrc/usr.bin/tnftp/libedit/prompt.c:1.7
--- othersrc/usr.bin/tnftp/libedit/prompt.c:1.6 Sun Jan 31 08:43:50 2016
+++ othersrc/usr.bin/tnftp/libedit/prompt.c Mon Feb 1 10:29:24 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: prompt.c,v 1.6 2016/01/31 08:43:50 lukem Exp $ */
+/* $NetBSD: prompt.c,v 1.7 2016/02/01 10:29:24 lukem Exp $ */
/* from NetBSD: prompt.c,v 1.20 2011/07/29 15:16:33 christos Exp */
/*-
@@ -33,11 +33,9 @@
* SUCH DAMAGE.
*/
-#include "tnftp.h"
-#include "sys.h"
-
-#if 0
#include "config.h"
+
+#if 0 /* tnftp */
#if !defined(lint) && !defined(SCCSID)
#if 0
static char sccsid[] = "@(#)prompt.c 8.1 (Berkeley) 6/4/93";
@@ -45,12 +43,15 @@ static char sccsid[] = "@(#)prompt.c 8.1
__RCSID(" NetBSD: prompt.c,v 1.20 2011/07/29 15:16:33 christos Exp ");
#endif
#endif /* not lint && not SCCSID */
-#endif
+#endif /* tnftp */
/*
* prompt.c: Prompt printing functions
*/
+#if 0 /* tnftp */
#include <stdio.h>
+#endif /* tnftp */
+
#include "el.h"
private Char *prompt_default(EditLine *);
Index: othersrc/usr.bin/tnftp/libedit/readline.c
diff -u othersrc/usr.bin/tnftp/libedit/readline.c:1.6 othersrc/usr.bin/tnftp/libedit/readline.c:1.7
--- othersrc/usr.bin/tnftp/libedit/readline.c:1.6 Sun Jan 31 08:43:50 2016
+++ othersrc/usr.bin/tnftp/libedit/readline.c Mon Feb 1 10:29:24 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: readline.c,v 1.6 2016/01/31 08:43:50 lukem Exp $ */
+/* $NetBSD: readline.c,v 1.7 2016/02/01 10:29:24 lukem Exp $ */
/* from NetBSD: readline.c,v 1.117 2015/06/02 15:35:31 christos Exp */
/*-
@@ -30,12 +30,12 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
-#if 0
#include "config.h"
+
+#if 0 /* tnftp */
#if !defined(lint) && !defined(SCCSID)
__RCSID(" NetBSD: readline.c,v 1.117 2015/06/02 15:35:31 christos Exp ");
#endif /* not lint && not SCCSID */
-#endif
#include <sys/types.h>
#include <sys/stat.h>
@@ -51,6 +51,7 @@ __RCSID(" NetBSD: readline.c,v 1.117 201
#include <fcntl.h>
#include <setjmp.h>
#include <vis.h>
+#endif /* tnftp */
#include "readline/readline.h"
#include "el.h"
Index: othersrc/usr.bin/tnftp/libedit/refresh.c
diff -u othersrc/usr.bin/tnftp/libedit/refresh.c:1.6 othersrc/usr.bin/tnftp/libedit/refresh.c:1.7
--- othersrc/usr.bin/tnftp/libedit/refresh.c:1.6 Sun Jan 31 08:43:50 2016
+++ othersrc/usr.bin/tnftp/libedit/refresh.c Mon Feb 1 10:29:24 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: refresh.c,v 1.6 2016/01/31 08:43:50 lukem Exp $ */
+/* $NetBSD: refresh.c,v 1.7 2016/02/01 10:29:24 lukem Exp $ */
/* from NetBSD: refresh.c,v 1.37 2011/07/29 23:44:45 christos Exp */
/*-
@@ -33,11 +33,9 @@
* SUCH DAMAGE.
*/
-#include "tnftp.h"
-#include "sys.h"
-
-#if 0
#include "config.h"
+
+#if 0 /* tnftp */
#if !defined(lint) && !defined(SCCSID)
#if 0
static char sccsid[] = "@(#)refresh.c 8.1 (Berkeley) 6/4/93";
@@ -45,15 +43,17 @@ static char sccsid[] = "@(#)refresh.c 8.
__RCSID(" NetBSD: refresh.c,v 1.37 2011/07/29 23:44:45 christos Exp ");
#endif
#endif /* not lint && not SCCSID */
-#endif
+#endif /* tnftp */
/*
* refresh.c: Lower level screen refreshing functions
*/
+#if 0 /* tnftp */
#include <stdio.h>
#include <ctype.h>
#include <unistd.h>
#include <string.h>
+#endif /* tnftp */
#include "el.h"
Index: othersrc/usr.bin/tnftp/libedit/search.c
diff -u othersrc/usr.bin/tnftp/libedit/search.c:1.6 othersrc/usr.bin/tnftp/libedit/search.c:1.7
--- othersrc/usr.bin/tnftp/libedit/search.c:1.6 Sun Jan 31 08:43:50 2016
+++ othersrc/usr.bin/tnftp/libedit/search.c Mon Feb 1 10:29:24 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: search.c,v 1.6 2016/01/31 08:43:50 lukem Exp $ */
+/* $NetBSD: search.c,v 1.7 2016/02/01 10:29:24 lukem Exp $ */
/* from NetBSD: search.c,v 1.31 2016/01/30 04:02:51 christos Exp */
/*-
@@ -33,12 +33,9 @@
* SUCH DAMAGE.
*/
-
-#include "tnftp.h"
-#include "sys.h"
-
-#if 0
#include "config.h"
+
+#if 0 /* tnftp */
#if !defined(lint) && !defined(SCCSID)
#if 0
static char sccsid[] = "@(#)search.c 8.1 (Berkeley) 6/4/93";
@@ -46,12 +43,15 @@ static char sccsid[] = "@(#)search.c 8.1
__RCSID(" NetBSD: search.c,v 1.31 2016/01/30 04:02:51 christos Exp ");
#endif
#endif /* not lint && not SCCSID */
-#endif
+#endif /* tnftp */
/*
* search.c: History and character search functions
*/
+#if 0 /* tnftp */
#include <stdlib.h>
+#endif /* tnftp */
+
#include "el.h"
/*
Index: othersrc/usr.bin/tnftp/libedit/tokenizer.c
diff -u othersrc/usr.bin/tnftp/libedit/tokenizer.c:1.6 othersrc/usr.bin/tnftp/libedit/tokenizer.c:1.7
--- othersrc/usr.bin/tnftp/libedit/tokenizer.c:1.6 Sun Jan 31 08:43:50 2016
+++ othersrc/usr.bin/tnftp/libedit/tokenizer.c Mon Feb 1 10:29:24 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: tokenizer.c,v 1.6 2016/01/31 08:43:50 lukem Exp $ */
+/* $NetBSD: tokenizer.c,v 1.7 2016/02/01 10:29:24 lukem Exp $ */
/* from NetBSD: tokenizer.c,v 1.22 2016/01/30 04:02:51 christos Exp */
/*-
@@ -33,11 +33,9 @@
* SUCH DAMAGE.
*/
-#include "tnftp.h"
-#include "sys.h"
-
-#if 0
#include "config.h"
+
+#if 0 /* tnftp */
#if !defined(lint) && !defined(SCCSID)
#if 0
static char sccsid[] = "@(#)tokenizer.c 8.1 (Berkeley) 6/4/93";
@@ -45,14 +43,17 @@ static char sccsid[] = "@(#)tokenizer.c
__RCSID(" NetBSD: tokenizer.c,v 1.22 2016/01/30 04:02:51 christos Exp ");
#endif
#endif /* not lint && not SCCSID */
-#endif
+#endif /* tnftp */
/* We build this file twice, once as NARROW, once as WIDE. */
/*
* tokenize.c: Bourne shell like tokenizer
*/
+#if 0 /* tnftp */
#include <string.h>
#include <stdlib.h>
+#endif /* tnftp */
+
#include "histedit.h"
#include "chartype.h"
Index: othersrc/usr.bin/tnftp/libedit/config.h
diff -u othersrc/usr.bin/tnftp/libedit/config.h:1.4 othersrc/usr.bin/tnftp/libedit/config.h:1.5
--- othersrc/usr.bin/tnftp/libedit/config.h:1.4 Sun Jan 31 22:08:37 2016
+++ othersrc/usr.bin/tnftp/libedit/config.h Mon Feb 1 10:29:24 2016
@@ -1,7 +1,7 @@
#include "tnftp.h"
#include "sys.h"
-#if 0 /* TNFTP build */
+#if 0 /* tnftp */
/* config.h. Generated from config.h.in by configure. */
/* config.h.in. Generated from configure.ac by autoheader. */
@@ -292,4 +292,4 @@
/* #undef LIBC_SCCS */
/* #undef lint */
-#endif /* TNFTP build */
+#endif /* tnftp */
Index: othersrc/usr.bin/tnftp/libedit/filecomplete.c
diff -u othersrc/usr.bin/tnftp/libedit/filecomplete.c:1.4 othersrc/usr.bin/tnftp/libedit/filecomplete.c:1.5
--- othersrc/usr.bin/tnftp/libedit/filecomplete.c:1.4 Sun Jan 31 08:43:50 2016
+++ othersrc/usr.bin/tnftp/libedit/filecomplete.c Mon Feb 1 10:29:24 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: filecomplete.c,v 1.4 2016/01/31 08:43:50 lukem Exp $ */
+/* $NetBSD: filecomplete.c,v 1.5 2016/02/01 10:29:24 lukem Exp $ */
/* from NetBSD: filecomplete.c,v 1.34 2014/10/18 15:07:02 riz Exp */
/*-
@@ -30,12 +30,12 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
-#if 0
#include "config.h"
+
+#if 0 /* tnftp */
#if !defined(lint) && !defined(SCCSID)
__RCSID(" NetBSD: filecomplete.c,v 1.34 2014/10/18 15:07:02 riz Exp ");
#endif /* not lint && not SCCSID */
-#endif
#include <sys/types.h>
#include <sys/stat.h>
@@ -49,6 +49,7 @@ __RCSID(" NetBSD: filecomplete.c,v 1.34
#include <limits.h>
#include <errno.h>
#include <fcntl.h>
+#endif /* tnftp */
#include "el.h"
#include "fcns.h" /* for EL_NUM_FCNS */
Index: othersrc/usr.bin/tnftp/libedit/histedit.h
diff -u othersrc/usr.bin/tnftp/libedit/histedit.h:1.4 othersrc/usr.bin/tnftp/libedit/histedit.h:1.5
--- othersrc/usr.bin/tnftp/libedit/histedit.h:1.4 Sun Jan 31 08:43:50 2016
+++ othersrc/usr.bin/tnftp/libedit/histedit.h Mon Feb 1 10:29:24 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: histedit.h,v 1.4 2016/01/31 08:43:50 lukem Exp $ */
+/* $NetBSD: histedit.h,v 1.5 2016/02/01 10:29:24 lukem Exp $ */
/* from NetBSD: histedit.h,v 1.53 2014/06/18 18:12:28 christos Exp */
/*-
@@ -44,8 +44,10 @@
#define LIBEDIT_MAJOR 2
#define LIBEDIT_MINOR 11
+#if 0 /* tnftp */
#include <sys/types.h>
#include <stdio.h>
+#endif /* tnftp */
#ifdef __cplusplus
extern "C" {
@@ -251,12 +253,14 @@ int tok_str(Tokenizer *, const char *,
* Begin Wide Character Support
*/
#ifdef __linux__
+/* XXX: tnftp - may need to move to tnftp.h */
/* Apparently we need _GNU_SOURCE defined to get access to wcsdup on Linux */
#ifndef _GNU_SOURCE
#define _GNU_SOURCE
#endif
#endif
+/* XXX: tnftp - may need to move to tnftp.h */
#include <wchar.h>
#include <wctype.h>
Index: othersrc/usr.bin/tnftp/libedit/tty.h
diff -u othersrc/usr.bin/tnftp/libedit/tty.h:1.4 othersrc/usr.bin/tnftp/libedit/tty.h:1.5
--- othersrc/usr.bin/tnftp/libedit/tty.h:1.4 Sun Jan 31 08:43:50 2016
+++ othersrc/usr.bin/tnftp/libedit/tty.h Mon Feb 1 10:29:24 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: tty.h,v 1.4 2016/01/31 08:43:50 lukem Exp $ */
+/* $NetBSD: tty.h,v 1.5 2016/02/01 10:29:24 lukem Exp $ */
/* from NetBSD: tty.h,v 1.15 2014/05/19 19:54:12 christos Exp */
/*-
@@ -43,8 +43,11 @@
#include "sys.h"
#include "histedit.h"
+
+#if 0 /* tnftp */
#include <termios.h>
#include <unistd.h>
+#endif /* tnftp */
/* Define our own since everyone gets it wrong! */
#define CONTROL(A) ((A) & 037)
Index: othersrc/usr.bin/tnftp/libedit/read.c
diff -u othersrc/usr.bin/tnftp/libedit/read.c:1.8 othersrc/usr.bin/tnftp/libedit/read.c:1.9
--- othersrc/usr.bin/tnftp/libedit/read.c:1.8 Sun Jan 31 08:43:50 2016
+++ othersrc/usr.bin/tnftp/libedit/read.c Mon Feb 1 10:29:24 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: read.c,v 1.8 2016/01/31 08:43:50 lukem Exp $ */
+/* $NetBSD: read.c,v 1.9 2016/02/01 10:29:24 lukem Exp $ */
/* from NetBSD: read.c,v 1.71 2014/07/06 18:15:34 christos Exp */
/*-
@@ -33,11 +33,9 @@
* SUCH DAMAGE.
*/
-#include "tnftp.h"
-#include "sys.h"
-
-#if 0
#include "config.h"
+
+#if 0 /* tnftp */
#if !defined(lint) && !defined(SCCSID)
#if 0
static char sccsid[] = "@(#)read.c 8.1 (Berkeley) 6/4/93";
@@ -45,17 +43,20 @@ static char sccsid[] = "@(#)read.c 8.1 (
__RCSID(" NetBSD: read.c,v 1.71 2014/07/06 18:15:34 christos Exp ");
#endif
#endif /* not lint && not SCCSID */
-#endif
+#endif /* tnftp */
/*
* read.c: Clean this junk up! This is horrible code.
* Terminal read functions
*/
+#if 0 /* tnftp */
#include <errno.h>
#include <fcntl.h>
#include <unistd.h>
#include <stdlib.h>
#include <limits.h>
+#endif /* tnftp */
+
#include "el.h"
#define OKCMD -1 /* must be -1! */
Index: othersrc/usr.bin/tnftp/libedit/tty.c
diff -u othersrc/usr.bin/tnftp/libedit/tty.c:1.8 othersrc/usr.bin/tnftp/libedit/tty.c:1.9
--- othersrc/usr.bin/tnftp/libedit/tty.c:1.8 Sun Jan 31 08:43:50 2016
+++ othersrc/usr.bin/tnftp/libedit/tty.c Mon Feb 1 10:29:24 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: tty.c,v 1.8 2016/01/31 08:43:50 lukem Exp $ */
+/* $NetBSD: tty.c,v 1.9 2016/02/01 10:29:24 lukem Exp $ */
/* from NetBSD: tty.c,v 1.49 2015/12/08 16:53:27 gson Exp */
/*-
@@ -33,11 +33,9 @@
* SUCH DAMAGE.
*/
-#include "tnftp.h"
-#include "sys.h"
-
-#if 0
#include "config.h"
+
+#if 0 /* tnftp */
#if !defined(lint) && !defined(SCCSID)
#if 0
static char sccsid[] = "@(#)tty.c 8.1 (Berkeley) 6/4/93";
@@ -45,16 +43,19 @@ static char sccsid[] = "@(#)tty.c 8.1 (B
__RCSID(" NetBSD: tty.c,v 1.49 2015/12/08 16:53:27 gson Exp ");
#endif
#endif /* not lint && not SCCSID */
-#endif
+#endif /* tnftp */
/*
* tty.c: tty interface stuff
*/
+#if 0 /* tnftp */
#include <assert.h>
#include <errno.h>
#include <unistd.h> /* for isatty */
#include <strings.h> /* for ffs */
#include <stdlib.h> /* for abort */
+#endif /* tnftp */
+
#include "el.h"
#include "tty.h"
Index: othersrc/usr.bin/tnftp/libedit/sys.h
diff -u othersrc/usr.bin/tnftp/libedit/sys.h:1.5 othersrc/usr.bin/tnftp/libedit/sys.h:1.6
--- othersrc/usr.bin/tnftp/libedit/sys.h:1.5 Sun Jan 31 08:43:50 2016
+++ othersrc/usr.bin/tnftp/libedit/sys.h Mon Feb 1 10:29:24 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: sys.h,v 1.5 2016/01/31 08:43:50 lukem Exp $ */
+/* $NetBSD: sys.h,v 1.6 2016/02/01 10:29:24 lukem Exp $ */
/* from NetBSD: sys.h,v 1.17 2011/09/28 14:08:04 christos Exp */
/*-
@@ -41,11 +41,17 @@
#ifndef _h_sys
#define _h_sys
+#if 0 /* tnftp */
+#ifdef HAVE_SYS_CDEFS_H
+#include <sys/cdefs.h>
+#endif
+#endif /* tnftp */
+
#if !defined(__attribute__) && (defined(__cplusplus) || !defined(__GNUC__) || __GNUC__ == 2 && __GNUC_MINOR__ < 8)
# define __attribute__(A)
#endif
-#if __not_for_tnftp
+#if 0 /* tnftp */
#ifndef __BEGIN_DECLS
# ifdef __cplusplus
# define __BEGIN_DECLS extern "C" {
@@ -55,7 +61,7 @@
# define __END_DECLS
# endif
#endif
-#endif /* __not_for_tnftp */
+#endif /* tnftp */
#ifndef public
# define public /* Externally visible functions/variables */
@@ -74,7 +80,7 @@
# define __arraycount(a) (sizeof(a) / sizeof(*(a)))
#endif
-#if __not_for_tnftp
+#if 0 /* tnftp */
#include <stdio.h>
#ifndef HAVE_STRLCAT
@@ -115,7 +121,7 @@ typedef unsigned int u_int32_t;
#define REGEX /* Use POSIX.2 regular expression functions */
#undef REGEXP /* Use UNIX V8 regular expression functions */
-#endif /* __not_for_tnftp */
+#endif /* tnftp */
#if defined(__sun)
extern int tgetent(char *, const char *);
@@ -126,7 +132,7 @@ extern char* tgoto(const char*, int, int
extern char* tgetstr(char*, char**);
#endif
-#if HAVE_REGEX_H
+#if HAVE_REGEX_H /* tnftp extension */
# include <regex.h>
# define REGEX
#endif
Index: othersrc/usr.bin/tnftp/libedit/readline/readline.h
diff -u othersrc/usr.bin/tnftp/libedit/readline/readline.h:1.5 othersrc/usr.bin/tnftp/libedit/readline/readline.h:1.6
--- othersrc/usr.bin/tnftp/libedit/readline/readline.h:1.5 Sun Jan 31 08:43:50 2016
+++ othersrc/usr.bin/tnftp/libedit/readline/readline.h Mon Feb 1 10:29:24 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: readline.h,v 1.5 2016/01/31 08:43:50 lukem Exp $ */
+/* $NetBSD: readline.h,v 1.6 2016/02/01 10:29:24 lukem Exp $ */
/* from NetBSD: readline.h,v 1.37 2015/06/02 15:36:45 christos Exp */
/*-
@@ -32,8 +32,10 @@
#ifndef _READLINE_H_
#define _READLINE_H_
+#if 0 /* tnftp */
#include <sys/types.h>
#include <stdio.h>
+#endif /* tnftp */
/* list of readline stuff supported by editline library's readline wrapper */
@@ -74,6 +76,7 @@ typedef KEYMAP_ENTRY *Keymap;
#define control_character_bit 0x40
#ifndef CTRL
+/* XXX: tnftp - may need to move to tnftp.h */
#include <sys/ioctl.h>
#if !defined(__sun) && !defined(__hpux) && !defined(_AIX)
#include <sys/ttydefaults.h>
