From 3f99c55cfc1cb5d824c46697d257cbf3d19d5d65 Mon Sep 17 00:00:00 2001 From: June McEnroe Date: Thu, 21 Nov 2019 17:02:53 -0500 Subject: Revert "Use local libedit" This reverts commit 4ec42616876188657fde1230f7c2ccd8396f18b1. --- bin/1sh/Makefile | 9 +++------ bin/1sh/histedit.c | 2 +- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/bin/1sh/Makefile b/bin/1sh/Makefile index 547079ad..afd0350b 100644 --- a/bin/1sh/Makefile +++ b/bin/1sh/Makefile @@ -1,8 +1,8 @@ PREFIX = /usr/local MANDIR = ${PREFIX}/share/man -CFLAGS += -std=c99 -Wall -Wextra -DSHELL -Ilibedit -LDLIBS = -lcurses +CFLAGS += -std=c99 -Wall -Wextra -DSHELL +LDLIBS = -ledit -include config.mk @@ -38,7 +38,7 @@ GENSRCS = builtins.c nodes.c syntax.c GENHDRS = builtins.h nodes.h syntax.h token.h SRCS += ${GENSRCS} -OBJS = ${SRCS:.c=.o} libedit/libedit.a +OBJS = ${SRCS:.c=.o} MANS = 1sh.1 1sh-kill.1 1sh-printf.1 1sh-test.1 @@ -49,9 +49,6 @@ all: tags 1sh ${OBJS}: ${GENHDRS} -libedit/libedit.a: - ${MAKE} -C libedit libedit.a - builtins.c builtins.h: mkbuiltins builtins.def sh mkbuiltins . diff --git a/bin/1sh/histedit.c b/bin/1sh/histedit.c index 4c0821dd..32e798e3 100644 --- a/bin/1sh/histedit.c +++ b/bin/1sh/histedit.c @@ -129,7 +129,7 @@ histedit(void) el_set(el, EL_RPROMPT, getrprompt); el_set(el, EL_ADDFN, "sh-complete", "Filename completion", - _el_fn_complete); + _el_fn_sh_complete); } else { bad: out2fmt_flush("sh: can't initialize editing\n"); -- cgit 1.4.1 nput type='hidden' name='id' value='e4118a0a5a67eb61966326cbdf9875bdd266d14c'/>
path: root/doc/zlib/gzbuffer.3 (unfollow)
Commit message (Expand)Author
2021-09-26Publish "Installing OpenBSD on Linode"June McEnroe
2021-09-26Use tiny UTF-8-aware col -b replacementJune McEnroe
2021-09-25Install up to cgi-binJune McEnroe
2021-09-25Clean up up (ugh) somewhat againJune McEnroe
2021-09-25Update root path in up.shJune McEnroe
2021-09-25Disable HashKnownHostsJune McEnroe
2021-09-25Add scout to ssh configJune McEnroe
2021-09-25Sandbox up on both FreeBSD and OpenBSDJune McEnroe
2021-09-25Set SO_REUSEADDR in quickJune McEnroe
2021-09-25Revert "Add cat alias using less"June McEnroe
2021-09-24Pledge downgradeJune McEnroe
2021-09-24Set original socket CLOEXECJune McEnroe
2021-09-24Consume request headers using MSG_PEEKJune McEnroe
2021-09-24Set only HTTP_HOSTJune McEnroe
2021-09-23Scroll by single lines in xtermJune McEnroe
2021-09-23Hide htop "function bar"June McEnroe
2021-09-23Allow FocusEvents in xtermJune McEnroe
2021-09-23Use NI_NUMERICSERVJune McEnroe
2021-09-23Make up build away from FreeBSDJune McEnroe
2021-09-23Add quickJune McEnroe
2021-09-23Add The HobbitJune McEnroe
2021-09-22Remove PSF fontsJune McEnroe
2021-09-22Remove Linux-specific utilitiesJune McEnroe
2021-09-22Call sandbox in CGI modeJune McEnroe
2021-09-22Support HTTP PUT in upJune McEnroe
2021-09-22Remove default faviconJune McEnroe
2021-09-21Use Z_FILTERED strategyJune McEnroe
2021-09-21Recalculate various lengths only as neededJune McEnroe
2021-09-21Rewrite pngo, add explicit optionsJune McEnroe
2021-09-16Fix /* **/ comment matchingJune McEnroe
2021-09-15Remove typer, add downgrade to READMEJune McEnroe
2021-09-15Set bot mode on downgradeJune McEnroe
2021-09-15Enter capsicum in downgradeJune McEnroe
2021-09-15Factor out common parts of downgrade messagesJune McEnroe
2021-09-14Add downgrade IRC botJune McEnroe
2021-09-14Sort by title if authors matchJune McEnroe
2021-09-13Swap-remove tags as they're foundJune McEnroe
2021-09-12Replace htagml regex with strncmpJune McEnroe
2021-09-11Also defer printing comment for lone close-parensJune McEnroe
2021-09-10Publish "git-comment"June McEnroe
2021-09-10Add git comment --pretty optionJune McEnroe
2021-09-08Defer printing comment if line is blank or closing braceJune McEnroe
2021-09-08Up default min-repeat to 30 linesJune McEnroe
2021-09-08Handle dirty lines in git-commentJune McEnroe
2021-09-08Document and install git-commentJune McEnroe
2021-09-08Add repeat and all options to git-commentJune McEnroe
2021-09-08Add group threshold to git-commentJune McEnroe