git: 136d69caf03b - main - libedit: import vendor snapshort 2025-01-03
Date: Wed, 16 Apr 2025 20:22:08 UTC
The branch main has been updated by bapt:
URL: https://cgit.FreeBSD.org/src/commit/?id=136d69caf03bc38de95c4df34c5a683e9ce81bfa
commit 136d69caf03bc38de95c4df34c5a683e9ce81bfa
Merge: 7a4c662f407f b3884193b7bd
Author: Baptiste Daroussin <bapt@FreeBSD.org>
AuthorDate: 2025-04-16 20:21:05 +0000
Commit: Baptiste Daroussin <bapt@FreeBSD.org>
CommitDate: 2025-04-16 20:21:05 +0000
libedit: import vendor snapshort 2025-01-03
contrib/libedit/Makefile | 14 ++-
contrib/libedit/chared.c | 6 +-
contrib/libedit/chartype.c | 12 +--
contrib/libedit/common.c | 7 +-
contrib/libedit/edit.expsym | 204 ++++++++++++++++++++++++++++++++++++
contrib/libedit/editline.3 | 4 +-
contrib/libedit/editline.7 | 6 +-
contrib/libedit/el.c | 5 +-
contrib/libedit/el.h | 5 +-
contrib/libedit/eln.c | 12 ++-
contrib/libedit/emacs.c | 10 +-
contrib/libedit/filecomplete.c | 6 +-
contrib/libedit/filecomplete.h | 5 +-
contrib/libedit/history.c | 13 ++-
contrib/libedit/keymacro.c | 8 +-
contrib/libedit/libedit.pc | 12 +++
contrib/libedit/literal.c | 6 +-
contrib/libedit/map.c | 5 +-
contrib/libedit/read.c | 5 +-
contrib/libedit/readline.c | 24 +++--
contrib/libedit/readline/readline.h | 38 ++++---
contrib/libedit/refresh.c | 14 ++-
contrib/libedit/search.c | 7 +-
contrib/libedit/sig.c | 6 +-
contrib/libedit/sys.h | 4 +-
contrib/libedit/tokenizer.c | 10 +-
26 files changed, 350 insertions(+), 98 deletions(-)
diff --cc contrib/libedit/Makefile
index 105a6a92e0ee,000000000000..f7cd3baf885f
mode 100644,000000..100644
--- a/contrib/libedit/Makefile
+++ b/contrib/libedit/Makefile
@@@ -1,143 -1,0 +1,149 @@@
- # $NetBSD: Makefile,v 1.66 2019/10/13 07:28:10 mrg Exp $
++# $NetBSD: Makefile,v 1.70 2023/08/03 14:56:36 rin Exp $
+# @(#)Makefile 8.1 (Berkeley) 6/4/93
+
+USE_SHLIBDIR= yes
+
+WARNS?= 5
+LIB= edit
+
+LIBDPLIBS+= terminfo ${.CURDIR}/../libterminfo
+
+.include "bsd.own.mk"
+
+COPTS+= -Wunused-parameter
+CWARNFLAGS.gcc+= -Wconversion
+CWARNFLAGS.clang+= -Wno-cast-qual
+
+SRCS = chared.c 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
+
+MAN= editline.3 editrc.5 editline.7
+
++FILES+= libedit.pc
++FILESOWN_libedit.pc= ${BINOWN}
++FILESGRP_libedit.pc= ${BINGRP}
++FILESMODE_libedit.pc= ${NONBINMODE}
++FILESDIR_libedit.pc= /usr/lib/pkgconfig
++
+MLINKS= \
+editline.3 el_deletestr.3 \
+editline.3 el_end.3 \
+editline.3 el_get.3 \
+editline.3 el_getc.3 \
+editline.3 el_gets.3 \
+editline.3 el_init.3 \
+editline.3 el_init_fd.3 \
+editline.3 el_insertstr.3 \
+editline.3 el_line.3 \
+editline.3 el_parse.3 \
+editline.3 el_push.3 \
+editline.3 el_reset.3 \
+editline.3 el_resize.3 \
+editline.3 el_set.3 \
+editline.3 el_source.3 \
+editline.3 history.3 \
+editline.3 history_end.3 \
+editline.3 history_init.3 \
+editline.3 tok_end.3 \
+editline.3 tok_init.3 \
+editline.3 tok_line.3 \
+editline.3 tok_reset.3 \
+editline.3 tok_str.3
+
+MLINKS+= \
+editline.3 el_wdeletestr.3 \
+editline.3 el_wget.3 \
+editline.3 el_wgetc.3 \
+editline.3 el_wgets.3 \
+editline.3 el_winsertstr.3 \
+editline.3 el_wline.3 \
+editline.3 el_wparse.3 \
+editline.3 el_wpush.3 \
+editline.3 el_wset.3 \
+editline.3 history_w.3 \
+editline.3 history_wend.3 \
+editline.3 history_winit.3 \
+editline.3 tok_wend.3 \
+editline.3 tok_winit.3 \
+editline.3 tok_wline.3 \
+editline.3 tok_wreset.3 \
+editline.3 tok_wstr.3
+
+LIBEDITDIR?=${.CURDIR}
+
+INCS= histedit.h
+INCSDIR=/usr/include
+
+CLEANFILES+=common.h.tmp emacs.h.tmp fcns.h.tmp func.h.tmp
+CLEANFILES+=help.h.tmp vi.h.tmp tc1.o tc1 .depend
+
+CPPFLAGS+=-I. -I${LIBEDITDIR}
+CPPFLAGS+=-I. -I${.CURDIR}
+#CPPFLAGS+=-DDEBUG_TTY -DDEBUG_KEY -DDEBUG -DDEBUG_REFRESH
+#CPPFLAGS+=-DDEBUG_PASTE -DDEBUG_EDIT
+
+AHDR=vi.h emacs.h common.h
+ASRC=${LIBEDITDIR}/vi.c ${LIBEDITDIR}/emacs.c ${LIBEDITDIR}/common.c
+
+DPSRCS+= ${AHDR} fcns.h func.h help.h
+CLEANFILES+= ${AHDR} fcns.h func.h help.h
+
+SUBDIR= readline
+
+.depend: ${AHDR} fcns.h func.h help.h
+
+vi.h: vi.c makelist Makefile
+ ${_MKTARGET_CREATE}
+ ${HOST_SH} ${LIBEDITDIR}/makelist -h ${LIBEDITDIR}/vi.c \
+ > ${.TARGET}.tmp && \
+ mv ${.TARGET}.tmp ${.TARGET}
+
+emacs.h: emacs.c makelist Makefile
+ ${_MKTARGET_CREATE}
+ ${HOST_SH} ${LIBEDITDIR}/makelist -h ${LIBEDITDIR}/emacs.c \
+ > ${.TARGET}.tmp && \
+ mv ${.TARGET}.tmp ${.TARGET}
+
+common.h: common.c makelist Makefile
+ ${_MKTARGET_CREATE}
+ ${HOST_SH} ${LIBEDITDIR}/makelist -h ${LIBEDITDIR}/common.c \
+ > ${.TARGET}.tmp && \
+ mv ${.TARGET}.tmp ${.TARGET}
+
+fcns.h: ${AHDR} makelist Makefile
+ ${_MKTARGET_CREATE}
+ ${HOST_SH} ${LIBEDITDIR}/makelist -fh ${AHDR} > ${.TARGET}.tmp && \
+ mv ${.TARGET}.tmp ${.TARGET}
+
+func.h: ${AHDR} makelist Makefile
+ ${_MKTARGET_CREATE}
+ ${HOST_SH} ${LIBEDITDIR}/makelist -fc ${AHDR} > ${.TARGET}.tmp && \
+ mv ${.TARGET}.tmp ${.TARGET}
+
+help.h: ${ASRC} makelist Makefile
+ ${_MKTARGET_CREATE}
+ ${HOST_SH} ${LIBEDITDIR}/makelist -bh ${ASRC} > ${.TARGET}.tmp && \
+ mv ${.TARGET}.tmp ${.TARGET}
+
+tc1.o: ${LIBEDITDIR}/TEST/tc1.c
+
+tc1: libedit.a tc1.o
+ ${_MKTARGET_LINK}
+ ${CC} ${LDFLAGS} ${.ALLSRC} -o ${.TARGET} libedit.a ${LDADD} -ltermlib
+
+.include <bsd.lib.mk>
+.include <bsd.subdir.mk>
+
+# XXX
+.if defined(HAVE_GCC)
+COPTS.editline.c+= -Wno-cast-qual
+COPTS.literal.c+= -Wno-sign-conversion
+COPTS.tokenizer.c+= -Wno-cast-qual
+COPTS.tokenizern.c+= -Wno-cast-qual
+.endif
+
- COPTS.history.c+= ${GCC_NO_STRINGOP_OVERFLOW}
- COPTS.historyn.c+= ${GCC_NO_STRINGOP_OVERFLOW}
- COPTS.readline.c+= ${GCC_NO_STRINGOP_TRUNCATION} ${GCC_NO_STRINGOP_OVERFLOW}
++COPTS.history.c+= ${CC_WNO_STRINGOP_OVERFLOW}
++COPTS.historyn.c+= ${CC_WNO_STRINGOP_OVERFLOW}
++COPTS.readline.c+= ${CC_WNO_STRINGOP_TRUNCATION} ${CC_WNO_STRINGOP_OVERFLOW}
diff --cc contrib/libedit/edit.expsym
index 000000000000,c5d021b31a65..c5d021b31a65
mode 000000,100644..100644
--- a/contrib/libedit/edit.expsym
+++ b/contrib/libedit/edit.expsym
diff --cc contrib/libedit/libedit.pc
index 000000000000,c08a8ba70b12..c08a8ba70b12
mode 000000,100644..100644
--- a/contrib/libedit/libedit.pc
+++ b/contrib/libedit/libedit.pc