Module Name: othersrc
Committed By: lukem
Date: Sat Jul 4 14:34:28 UTC 2020
Modified Files:
othersrc/usr.bin/tnftp/libedit: Makefile.am literal.c vi.c
Log Message:
fix libedit build after 20200704 merge
adapt the build of libedit for the changes in upstream;
- generate appropriate headers
- tnftp-ify literal.c and vi.c
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 othersrc/usr.bin/tnftp/libedit/Makefile.am
cvs rdiff -u -r1.1.1.1 -r1.2 othersrc/usr.bin/tnftp/libedit/literal.c
cvs rdiff -u -r1.9 -r1.10 othersrc/usr.bin/tnftp/libedit/vi.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/Makefile.am
diff -u othersrc/usr.bin/tnftp/libedit/Makefile.am:1.4 othersrc/usr.bin/tnftp/libedit/Makefile.am:1.5
--- othersrc/usr.bin/tnftp/libedit/Makefile.am:1.4 Sun Jan 31 22:18:35 2016
+++ othersrc/usr.bin/tnftp/libedit/Makefile.am Sat Jul 4 14:34:28 2020
@@ -1,4 +1,4 @@
-## $NetBSD: Makefile.am,v 1.4 2016/01/31 22:18:35 lukem Exp $
+## $NetBSD: Makefile.am,v 1.5 2020/07/04 14:34:28 lukem Exp $
noinst_LTLIBRARIES = libedit.la
@@ -7,19 +7,25 @@ libedit_la_SOURCES = \
chartype.c \
common.c \
el.c \
+ eln.c \
emacs.c \
+ filecomplete.c \
hist.c \
history.c \
+ historyn.c \
keymacro.c \
+ literal.c \
map.c \
parse.c \
prompt.c \
read.c \
+ readline.c \
refresh.c \
search.c \
sig.c \
terminal.c \
tokenizer.c \
+ tokenizern.c \
tty.c \
vi.c
@@ -36,9 +42,8 @@ libedit_la_LIBADD = \
generated_files = \
common.h \
emacs.h \
- fcns.c \
fcns.h \
- help.c \
+ func.h \
help.h\
vi.h
@@ -66,31 +71,30 @@ common.h: common.c
fcns.h: vi.h emacs.h common.h
$(AM_V_GEN)$(MAKELIST) -fh vi.h emacs.h common.h > $@
-fcns.c: vi.h emacs.h common.h fcns.h help.h
+func.h: vi.h emacs.h common.h
$(AM_V_GEN)$(MAKELIST) -fc vi.h emacs.h common.h > $@
-help.c: vi.c emacs.c common.c
- $(AM_V_GEN)$(MAKELIST) -bc $(srcdir)/vi.c $(srcdir)/emacs.c $(srcdir)/common.c > $@
-
help.h: vi.c emacs.c common.c
$(AM_V_GEN)$(MAKELIST) -bh $(srcdir)/vi.c $(srcdir)/emacs.c $(srcdir)/common.c > $@
EXTRA_DIST = \
+ TEST \
chared.h \
chartype.h \
+ config.h \
editline.3 \
+ editline.7 \
editrc.5 \
el.h \
- filecomplete.c \
filecomplete.h \
hist.h \
histedit.h \
keymacro.h \
+ literal.h \
map.h \
parse.h \
prompt.h \
read.h \
- readline.c \
readline/readline.h \
refresh.h \
search.h \
Index: othersrc/usr.bin/tnftp/libedit/literal.c
diff -u othersrc/usr.bin/tnftp/libedit/literal.c:1.1.1.1 othersrc/usr.bin/tnftp/libedit/literal.c:1.2
--- othersrc/usr.bin/tnftp/libedit/literal.c:1.1.1.1 Sat Jul 4 12:41:18 2020
+++ othersrc/usr.bin/tnftp/libedit/literal.c Sat Jul 4 14:34:28 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: literal.c,v 1.1.1.1 2020/07/04 12:41:18 lukem Exp $ */
+/* $NetBSD: literal.c,v 1.2 2020/07/04 14:34:28 lukem Exp $ */
/* from NetBSD: literal.c,v 1.5 2019/07/23 13:10:11 christos Exp */
/*-
@@ -31,17 +31,23 @@
*/
#include "config.h"
+
+#if 0 /* tnftp */
#if !defined(lint) && !defined(SCCSID)
__RCSID(" NetBSD: literal.c,v 1.5 2019/07/23 13:10:11 christos Exp ");
#endif /* not lint && not SCCSID */
+#endif /* tnftp */
/*
* literal.c: Literal sequences handling.
*/
+#if 0 /* tnftp */
#include <assert.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
+#endif /* tnftp */
+
#include "el.h"
libedit_private void
Index: othersrc/usr.bin/tnftp/libedit/vi.c
diff -u othersrc/usr.bin/tnftp/libedit/vi.c:1.9 othersrc/usr.bin/tnftp/libedit/vi.c:1.10
--- othersrc/usr.bin/tnftp/libedit/vi.c:1.9 Sat Jul 4 13:43:21 2020
+++ othersrc/usr.bin/tnftp/libedit/vi.c Sat Jul 4 14:34:28 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: vi.c,v 1.9 2020/07/04 13:43:21 lukem Exp $ */
+/* $NetBSD: vi.c,v 1.10 2020/07/04 14:34:28 lukem Exp $ */
/* from NetBSD: vi.c,v 1.63 2019/07/23 10:18:52 christos Exp */
/*-
@@ -35,6 +35,7 @@
#include "config.h"
+#if 0 /* tnftp */
#if !defined(lint) && !defined(SCCSID)
#if 0
static char sccsid[] = "@(#)vi.c 8.1 (Berkeley) 6/4/93";
@@ -42,6 +43,7 @@ static char sccsid[] = "@(#)vi.c 8.1 (Be
__RCSID(" NetBSD: vi.c,v 1.63 2019/07/23 10:18:52 christos Exp ");
#endif
#endif /* not lint && not SCCSID */
+#endif /* tnftp */
/*
* vi.c: Vi mode commands.
