diff options
| author | bptato <nincsnevem662@gmail.com> | 2024-01-08 00:37:54 +0100 |
|---|---|---|
| committer | bptato <nincsnevem662@gmail.com> | 2024-01-08 00:37:54 +0100 |
| commit | b0547ba9f48bf402665b89f84b88b80ee58d8824 (patch) | |
| tree | 39bf645df6ea365f912040255eb136c5deafe2b1 /Makefile | |
| parent | 10a02b2ae2613b383453ba99318330560e9371ac (diff) | |
| download | chawan-b0547ba9f48bf402665b89f84b88b80ee58d8824.tar.gz | |
Add urlenc, urldec; fix a URL encoding bug; improve trans.cgi
* Fix incorrect internal definition of the fragment percent-encode set * urlenc, urldec: these are simple utility programs mainly for use with shell local CGI scripts. (Sadly the printf + xargs solution is not portable.) * Pass libexec directory as an env var to local CGI scripts * Update trans.cgi to use urldec and add an example for combining it with selections
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 17 |
1 files changed, 16 insertions, 1 deletions
diff --git a/Makefile b/Makefile index ddeb0fa5..58557e06 100644 --- a/Makefile +++ b/Makefile @@ -44,7 +44,8 @@ all: $(OUTDIR_BIN)/cha $(OUTDIR_CGI_BIN)/http \ $(OUTDIR_CGI_BIN)/gopher $(OUTDIR_LIBEXEC)/gopher2html \ $(OUTDIR_CGI_BIN)/cha-finger $(OUTDIR_CGI_BIN)/about \ $(OUTDIR_CGI_BIN)/data $(OUTDIR_CGI_BIN)/file $(OUTDIR_CGI_BIN)/ftp \ - $(OUTDIR_CGI_BIN)/spartan + $(OUTDIR_CGI_BIN)/spartan \ + $(OUTDIR_LIBEXEC)/urldec $(OUTDIR_LIBEXEC)/urlenc $(OUTDIR_BIN)/cha: lib/libquickjs.a src/*.nim src/**/*.nim src/**/*.c res/* \ res/**/* res/map/idna_gen.nim @@ -130,6 +131,16 @@ $(OUTDIR_CGI_BIN)/gopher: adapter/protocol/gopher.nim adapter/protocol/curlwrap. $(NIMC) $(FLAGS) -d:curlLibName:$(CURLLIBNAME) --nimcache:"$(OBJDIR)/$(TARGET)/gopher" \ -o:"$(OUTDIR_CGI_BIN)/gopher" adapter/protocol/gopher.nim +$(OUTDIR_LIBEXEC)/urldec: adapter/tools/urldec.nim src/utils/twtstr.nim + @mkdir -p "$(OUTDIR_LIBEXEC)" + $(NIMC) $(FLAGS) --nimcache:"$(OBJDIR)/$(TARGET)/urldec" \ + -o:"$(OUTDIR_LIBEXEC)/urldec" adapter/tools/urldec.nim + +$(OUTDIR_LIBEXEC)/urlenc: adapter/tools/urlenc.nim src/utils/twtstr.nim + @mkdir -p "$(OUTDIR_LIBEXEC)" + $(NIMC) $(FLAGS) --nimcache:"$(OBJDIR)/$(TARGET)/urlenc" \ + -o:"$(OUTDIR_LIBEXEC)/urlenc" adapter/tools/urlenc.nim + CFLAGS = -fwrapv -g -Wall -O2 -DCONFIG_VERSION=\"$(shell cat lib/quickjs/VERSION)\" QJSOBJ = $(OBJDIR)/quickjs @@ -195,6 +206,8 @@ install: install -m755 "$(OUTDIR_CGI_BIN)/gmifetch" $(LIBEXECDIR_CHAWAN)/cgi-bin install -m755 "$(OUTDIR_CGI_BIN)/cha-finger" $(LIBEXECDIR_CHAWAN)/cgi-bin install -m755 "$(OUTDIR_CGI_BIN)/spartan" $(LIBEXECDIR_CHAWAN)/cgi-bin + install -m755 "$(OUTDIR_LIBEXEC)/urldec" $(LIBEXECDIR_CHAWAN)/urldec + install -m755 "$(OUTDIR_LIBEXEC)/urlenc" $(LIBEXECDIR_CHAWAN)/urlenc if test -d "$(OBJDIR)/man"; then \ mkdir -p "$(DESTDIR)$(MANPREFIX5)"; \ mkdir -p "$(DESTDIR)$(MANPREFIX1)"; \ @@ -222,6 +235,8 @@ uninstall: rmdir $(LIBEXECDIR_CHAWAN)/cgi-bin || true rm -f $(LIBEXECDIR_CHAWAN)/gopher2html rm -f $(LIBEXECDIR_CHAWAN)/gmi2html + rm -f $(LIBEXECDIR_CHAWAN)/urldec + rm -f $(LIBEXECDIR_CHAWAN)/urlenc rmdir $(LIBEXECDIR_CHAWAN) || true rm -f "$(DESTDIR)$(MANPREFIX5)/cha-config.5" rm -f "$(DESTDIR)$(MANPREFIX5)/cha-mailcap.5" |