summaryrefslogtreecommitdiffabout
authorSergey Poznyakoff <gray@gnu.org>2019-07-10 17:52:50 (GMT)
committer Sergey Poznyakoff <gray@gnu.org>2019-07-10 17:52:50 (GMT)
commitc59f619e101464874ba1535c7a2bed42306b5866 (patch) (side-by-side diff)
tree98bc4f9f3de024355eef2db18cdedb7468a63ec9
parent7b4f6c89f533422d8f822c1395fffe31a6790ecf (diff)
downloadfileserv-c59f619e101464874ba1535c7a2bed42306b5866.tar.gz
fileserv-c59f619e101464874ba1535c7a2bed42306b5866.tar.bz2
Use wordsplit for a submodule
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--.gitmodules3
-rw-r--r--Makefile.am2
-rw-r--r--src/Makefile.am6
-rw-r--r--src/idx.c2
m---------wordsplit0
5 files changed, 8 insertions, 5 deletions
diff --git a/.gitmodules b/.gitmodules
new file mode 100644
index 0000000..ec3950b
--- a/dev/null
+++ b/.gitmodules
@@ -0,0 +1,3 @@
+[submodule "wordsplit"]
+ path = wordsplit
+ url = git://git.gnu.org.ua/wordsplit.git
diff --git a/Makefile.am b/Makefile.am
index 7d86aaf..2bd6172 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,3 +1,3 @@
-EXTRA_DIST=README
+EXTRA_DIST=README wordsplit/wordsplit.c wordsplit/wordsplit.h
SUBDIRS = mimetypes src
distuninstallcheck_listfiles = find . -type f -not -name 'fileserv.conf' -print
diff --git a/src/Makefile.am b/src/Makefile.am
index dcefc04..7bc1f9e 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,14 +1,16 @@
sbin_PROGRAMS=fileserv
fileserv_SOURCES=fileserv.c runas.c fileserv.h logger.c pidfile.c\
- wordsplit.c wordsplit.h catfile.c config.c idx.c defidx.h\
+ catfile.c config.c idx.c defidx.h\
mem.c remoteip.c icon.c dirls.c dirls.h lang.c httperr.c
+nodist_fileserv_SOURCES=wordsplit.c wordsplit.h
BUILT_SOURCES=defidx.h
if FSRV_WRAP
fileserv_SOURCES += wrapacl.c
endif
dist_man_MANS=fileserv.8
LDADD = ../mimetypes/libmimetypes.a
-AM_CPPFLAGS = -I $(top_srcdir)/mimetypes -DSYSCONFDIR=\"$(sysconfdir)\"
+VPATH += $(top_srcdir)/wordsplit
+AM_CPPFLAGS = -I $(top_srcdir)/wordsplit -I $(top_srcdir)/mimetypes -DSYSCONFDIR=\"$(sysconfdir)\"
EXTRA_DIST=ftoc.sed defidx.html fileserv.conf
.html.h:
$(AM_V_GEN)sed -f $(srcdir)/ftoc.sed $< > $@
diff --git a/src/idx.c b/src/idx.c
index 0ec7d29..17fdd58 100644
--- a/src/idx.c
+++ b/src/idx.c
@@ -782,7 +782,6 @@ directory_index(int fd, CONFIG const *conf,
env.ws.ws_command = template_command;
env.ws.ws_closure = &env;
env.ws.ws_env = varenv;
- env.ws.ws_options = WRDSO_ARGV;
env.wsflags = WRDSF_NOSPLIT
| WRDSF_WS
@@ -790,7 +789,6 @@ directory_index(int fd, CONFIG const *conf,
| WRDSF_SHOWERR
| WRDSF_GETVAR
| WRDSF_CLOSURE
- | WRDSF_OPTIONS
| WRDSF_ENV
| WRDSF_ENV_KV
;
diff --git a/wordsplit b/wordsplit
new file mode 160000
+Subproject 6ccb9ad200f6fa0b59a3d17e7e069badb2d39e5

Return to:

Send suggestions and report system problems to the System administrator.