Rename to, and improve, cgiwrapper-nollmcrawler

6 files changed, 13 insertions, 11 deletions

diff --git a/.gitignore b/.gitignore
index 589246f..0d33be1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -11,4 +11,4 @@
 /tipidee-config-preprocess
 /tipidee-logaggregate
 /ls.cgi
-/cgit-nollmcrawler.cgi
+/cgiwrapper-nollmcrawler
diff --git a/package/deps.mak b/package/deps.mak
index ad04202..5fd8da0 100644
--- a/package/deps.mak
+++ b/package/deps.mak
@@ -63,7 +63,6 @@ src/libtipidee/tipidee_util_defaulttext.o src/libtipidee/tipidee_util_defaulttex
 src/libtipidee/tipidee_util_htmlescape.o src/libtipidee/tipidee_util_htmlescape.lo: src/libtipidee/tipidee_util_htmlescape.c src/include/tipidee/util.h
 src/libtipidee/tipidee_util_httpdate.o src/libtipidee/tipidee_util_httpdate.lo: src/libtipidee/tipidee_util_httpdate.c src/include/tipidee/util.h
 src/libtipidee/tipidee_util_parse_range.o src/libtipidee/tipidee_util_parse_range.lo: src/libtipidee/tipidee_util_parse_range.c src/include/tipidee/util.h
-src/misc/cgit-nollmcrawler.o src/misc/cgit-nollmcrawler.lo: src/misc/cgit-nollmcrawler.c
 src/misc/ls.cgi.o src/misc/ls.cgi.lo: src/misc/ls.cgi.c src/include/tipidee/response.h src/include/tipidee/util.h
 src/misc/tipidee-logaggregate.o src/misc/tipidee-logaggregate.lo: src/misc/tipidee-logaggregate.c
 src/tipideed/cgi.o src/tipideed/cgi.lo: src/tipideed/cgi.c src/include/tipidee/tipidee.h src/tipideed/tipideed-internal.h
@@ -93,8 +92,8 @@ libtipidee.so.xyzzy: EXTRA_LIBS := -lskarnet
 libtipidee.so.xyzzy:src/libtipidee/tipidee_conf_free.lo src/libtipidee/tipidee_conf_get.lo src/libtipidee/tipidee_conf_get_argv.lo src/libtipidee/tipidee_conf_get_content_type.lo src/libtipidee/tipidee_conf_get_errorfile.lo src/libtipidee/tipidee_conf_get_redirection.lo src/libtipidee/tipidee_conf_get_resattr.lo src/libtipidee/tipidee_conf_get_resattr1.lo src/libtipidee/tipidee_conf_get_responseheaders.lo src/libtipidee/tipidee_conf_get_string.lo src/libtipidee/tipidee_conf_get_uint32.lo src/libtipidee/tipidee_conf_init.lo src/libtipidee/tipidee_headers_get_content_length.lo src/libtipidee/tipidee_headers_init.lo src/libtipidee/tipidee_headers_parse.lo src/libtipidee/tipidee_headers_search.lo src/libtipidee/tipidee_log_answer.lo src/libtipidee/tipidee_log_exit.lo src/libtipidee/tipidee_log_request.lo src/libtipidee/tipidee_log_resource.lo src/libtipidee/tipidee_log_start.lo src/libtipidee/tipidee_method.lo src/libtipidee/tipidee_response_error_nofile.lo src/libtipidee/tipidee_response_error_nofile_G.lo src/libtipidee/tipidee_response_file.lo src/libtipidee/tipidee_response_file_G.lo src/libtipidee/tipidee_response_header_date.lo src/libtipidee/tipidee_response_header_date_G.lo src/libtipidee/tipidee_response_header_date_fmt.lo src/libtipidee/tipidee_response_header_end.lo src/libtipidee/tipidee_response_header_lastmodified.lo src/libtipidee/tipidee_response_header_preparebuiltin.lo src/libtipidee/tipidee_response_header_write.lo src/libtipidee/tipidee_response_header_writeall.lo src/libtipidee/tipidee_response_header_writeall_G.lo src/libtipidee/tipidee_response_header_writemerge.lo src/libtipidee/tipidee_response_header_writemerge_G.lo src/libtipidee/tipidee_response_partial.lo src/libtipidee/tipidee_response_partial_G.lo src/libtipidee/tipidee_response_status.lo src/libtipidee/tipidee_rql_read.lo src/libtipidee/tipidee_uri_parse.lo src/libtipidee/tipidee_util_chunked_read.lo src/libtipidee/tipidee_util_defaulttext.lo src/libtipidee/tipidee_util_htmlescape.lo src/libtipidee/tipidee_util_httpdate.lo src/libtipidee/tipidee_util_parse_range.lo
 libtipidee.dylib.xyzzy: EXTRA_LIBS := -lskarnet
 libtipidee.dylib.xyzzy:src/libtipidee/tipidee_conf_free.lo src/libtipidee/tipidee_conf_get.lo src/libtipidee/tipidee_conf_get_argv.lo src/libtipidee/tipidee_conf_get_content_type.lo src/libtipidee/tipidee_conf_get_errorfile.lo src/libtipidee/tipidee_conf_get_redirection.lo src/libtipidee/tipidee_conf_get_resattr.lo src/libtipidee/tipidee_conf_get_resattr1.lo src/libtipidee/tipidee_conf_get_responseheaders.lo src/libtipidee/tipidee_conf_get_string.lo src/libtipidee/tipidee_conf_get_uint32.lo src/libtipidee/tipidee_conf_init.lo src/libtipidee/tipidee_headers_get_content_length.lo src/libtipidee/tipidee_headers_init.lo src/libtipidee/tipidee_headers_parse.lo src/libtipidee/tipidee_headers_search.lo src/libtipidee/tipidee_log_answer.lo src/libtipidee/tipidee_log_exit.lo src/libtipidee/tipidee_log_request.lo src/libtipidee/tipidee_log_resource.lo src/libtipidee/tipidee_log_start.lo src/libtipidee/tipidee_method.lo src/libtipidee/tipidee_response_error_nofile.lo src/libtipidee/tipidee_response_error_nofile_G.lo src/libtipidee/tipidee_response_file.lo src/libtipidee/tipidee_response_file_G.lo src/libtipidee/tipidee_response_header_date.lo src/libtipidee/tipidee_response_header_date_G.lo src/libtipidee/tipidee_response_header_date_fmt.lo src/libtipidee/tipidee_response_header_end.lo src/libtipidee/tipidee_response_header_lastmodified.lo src/libtipidee/tipidee_response_header_preparebuiltin.lo src/libtipidee/tipidee_response_header_write.lo src/libtipidee/tipidee_response_header_writeall.lo src/libtipidee/tipidee_response_header_writeall_G.lo src/libtipidee/tipidee_response_header_writemerge.lo src/libtipidee/tipidee_response_header_writemerge_G.lo src/libtipidee/tipidee_response_partial.lo src/libtipidee/tipidee_response_partial_G.lo src/libtipidee/tipidee_response_status.lo src/libtipidee/tipidee_rql_read.lo src/libtipidee/tipidee_uri_parse.lo src/libtipidee/tipidee_util_chunked_read.lo src/libtipidee/tipidee_util_defaulttext.lo src/libtipidee/tipidee_util_htmlescape.lo src/libtipidee/tipidee_util_httpdate.lo src/libtipidee/tipidee_util_parse_range.lo
-cgit-nollmcrawler: EXTRA_LIBS :=
-cgit-nollmcrawler: src/misc/cgit-nollmcrawler.o -lskarnet
+cgiwrapper-nollmcrawler: EXTRA_LIBS :=
+cgiwrapper-nollmcrawler: src/misc/cgiwrapper-nollmcrawler.o -lskarnet
 ls.cgi: EXTRA_LIBS :=
 ls.cgi: src/misc/ls.cgi.o libtipidee.a.xyzzy -lskarnet
 tipidee-logaggregate: EXTRA_LIBS :=
diff --git a/package/modes b/package/modes
index 9602f3f..76f0a89 100644
--- a/package/modes
+++ b/package/modes
@@ -3,4 +3,4 @@ tipidee-config-preprocess	0755
 tipidee-config			0755
 ls.cgi				0755
 tipidee-logaggregate		0755
-cgit-nollmcrawler		0755
+cgiwrapper-nollmcrawler		0755
diff --git a/package/targets.mak b/package/targets.mak
index 87d871a..d5bd14d 100644
--- a/package/targets.mak
+++ b/package/targets.mak
@@ -2,7 +2,7 @@ BIN_TARGETS := \
 tipideed \
 tipidee-config \
 tipidee-logaggregate \
-cgit-nollmcrawler
+cgiwrapper-nollmcrawler
 
 LIBEXEC_TARGETS := \
 tipidee-config-preprocess \
diff --git a/src/misc/cgit-nollmcrawler.c b/src/misc/cgiwrapper-nollmcrawler.c
index 71d31ae..95a2ea5 100644
--- a/src/misc/cgit-nollmcrawler.c
+++ b/src/misc/cgiwrapper-nollmcrawler.c
@@ -16,7 +16,7 @@
 #include <skalibs/fmtscan.h>
 #include <skalibs/exec.h>
 
-#define USAGE "as a CGI script: cgit-nollmcrawler [ -v verbosity ] [ -d pathinfodepth ] rulesdir badregex realcgit..."
+#define USAGE "as a CGI script: cgiwrapper-nollmcrawler [ -v verbosity ] [ -d pathinfodepth ] rulesdir badregex realcgit..."
 #define dieusage() strerr_dieusage(100, USAGE)
 
 enum golb_e
@@ -48,7 +48,7 @@ int main (int argc, char const *const *argv)
   char const *wgola[GOLA_N] = { 0 } ;
   uint64_t wgolb = 0 ;
   unsigned int golc ;
-  unsigned int depth = 1 ;
+  unsigned int depth = 0 ;
   char const *remoteaddr ;
   char const *x ;
   size_t rdlen, m = 0 ;
@@ -88,9 +88,12 @@ int main (int argc, char const *const *argv)
   if (errno != ENOENT) strerr_diefu2sys(111, "access ", fn) ;
   fn[m] = 0 ;
 
-  x = getenv("PATH_INFO") ;
-  if (!x) goto writeandallow ;
-  if (byte_count(x, strlen(x), '/') <= depth) goto writeandallow ;
+  if (depth)
+  {
+    x = getenv("PATH_INFO") ;
+    if (!x) goto writeandallow ;
+    if (byte_count(x, strlen(x), '/') <= depth) goto writeandallow ;
+  }
   x = getenv("QUERY_STRING") ;
   if (!x) goto writeandallow ;
 
diff --git a/src/misc/deps-exe/cgit-nollmcrawler b/src/misc/deps-exe/cgiwrapper-nollmcrawler
index e7187fe..e7187fe 100644
--- a/src/misc/deps-exe/cgit-nollmcrawler
+++ b/src/misc/deps-exe/cgiwrapper-nollmcrawler