Some bugfixes, more to come

 Thanks jjk for the bug-reports!

Signed-off-by: Laurent Bercot <ska@appnovation.com>

4 files changed, 21 insertions, 8 deletions

diff --git a/AUTHORS b/AUTHORS
index 0636516..049db5d 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -1,5 +1,8 @@
 Main author:
   Laurent Bercot <ska-skaware@skarnet.org>
 
+Contributors:
+  Olivier Brunel <jjk@jjacky.com>
+
 Thanks to:
   Lennart Jablonka <humm@ljabl.com>
diff --git a/doc/tipideed.html b/doc/tipideed.html
index 315a9ab..c97e5d5 100644
--- a/doc/tipideed.html
+++ b/doc/tipideed.html
@@ -108,7 +108,7 @@ data or in the document layout that it does not like. This can happen, for
 instance, when a document is a symbolic link pointing outside of the server's
 root. </dd>
  <dt> 111 </dt> <dd> System call failed. This usually signals an issue with the
-the underlying operating system. Before exiting, if in the middle of processing
+underlying operating system. Before exiting, if in the middle of processing
 a request, tipideed likely has sent a 500 (Internal Server Error) response to
 the client. </dd>
 </dl>
diff --git a/src/config/tipidee-config-preprocess.c b/src/config/tipidee-config-preprocess.c
index a5a47c2..3289eaa 100644
--- a/src/config/tipidee-config-preprocess.c
+++ b/src/config/tipidee-config-preprocess.c
@@ -21,7 +21,7 @@
 
 #define USAGE "tipidee-config-preprocess file"
 #define dieusage() strerr_dieusage(100, USAGE)
-#define dienomem() strerr_diefu1sys(111, "stralloc_catb") ;
+#define dienomem() strerr_diefu1sys(111, "build internal strings") ;
 
 static stralloc sa = STRALLOC_ZERO ;
 static genalloc ga = GENALLOC_ZERO ;  /* size_t */
@@ -63,7 +63,8 @@ static inline void includecwd (void)
   DIR *dir ;
   size_t sabase = sa.len ;
   size_t gabase = genalloc_len(size_t, &ga) ;
-  if (sagetcwd(&sa) < 0 || !stralloc_0(&sa)) dienomem() ;
+  if (sagetcwd(&sa) == -1) strerr_diefu1sys(111, "getcwd") ;
+  if (!stralloc_0(&sa)) dienomem() ;
   dir = opendir(".") ;
   if (!dir) strerr_diefu2sys(111, "opendir ", sa.s + sabase) ;
 
@@ -95,7 +96,7 @@ static void include (char const *file)
   size_t sabase = sa.len ;
   size_t filelen = strlen(file) ;
   if (!sadirname(&sa, file, filelen) || !stralloc_0(&sa)) dienomem() ;
-  if (chdir(sa.s + sabase) < 0) strerr_diefu2sys(111, "chdir to ", sa.s + sabase) ;
+  if (chdir(sa.s + sabase) == -1) strerr_diefu2sys(111, "chdir to ", sa.s + sabase) ;
   sa.len = sabase ;
   if (!sabasename(&sa, file, filelen)) dienomem() ;
   {
@@ -151,7 +152,16 @@ static void includefromhere (char const *file)
   char buf[4096] ;
   unsigned char state = 0 ;
 
-  if (!stralloc_catb(&namesa, "\004", 1) || sarealpath(&namesa, file) < 0 || !stralloc_0(&namesa)) dienomem() ;
+  if (!stralloc_catb(&namesa, "\004", 1)) dienomem() ;
+  if (sarealpath(&namesa, file) == -1)
+  {
+    cmd = errno ;
+    if (sagetcwd(&sa) == -1) strerr_diefu1sys(111, "getcwd") ;
+    if (!stralloc_0(&sa)) dienomem() ;
+    errno = cmd ;
+    strerr_dief4sys(111, "from directory ", sa.s + sabase, ": unable to realpath ", file) ;
+  }
+  if (!stralloc_0(&namesa)) dienomem() ;
   if (avltree_search(&namemap, namesa.s + namesabase + 1, &d))
   {
     if (namesa.s[d] & 0x04)
@@ -169,12 +179,12 @@ static void includefromhere (char const *file)
     if (!avltree_insert(&namemap, d)) dienomem() ;
   }
 
-  if (!string_quote(&sa, namesa.s + d + 1, strlen(namesa.s + d + 1))) dienomem() ;
+  if (!string_quote_nospace(&sa, namesa.s + d + 1, strlen(namesa.s + d + 1))) dienomem() ;
   if (!stralloc_0(&sa)) dienomem() ;
 
   sastart = sa.len ;
   fd = open_readb(file) ;
-  if (fd < 0) strerr_diefu2sys(111, "open ", namesa.s + d + 1) ;
+  if (fd == -1) strerr_diefu2sys(111, "open ", namesa.s + d + 1) ;
   buffer_init(&b, &buffer_read, fd, buf, 4096) ;
 
   if (buffer_put(buffer_1, "! 0 ", 4) < 4
diff --git a/src/tipideed/cgi.c b/src/tipideed/cgi.c
index be969c8..037076d 100644
--- a/src/tipideed/cgi.c
+++ b/src/tipideed/cgi.c
@@ -309,7 +309,7 @@ static inline int process_cgi_output (tipidee_rql *rql, char const *docroot, tip
   else
   {
     if (!status) status = 200 ;
-    if (!tipidee_headers_search(hdr, "Content-Type"))
+    if (status != 304 && !tipidee_headers_search(hdr, "Content-Type"))
       die502x(rql, 2, docroot, "cgi ", cginame, " didn't output a ", "Content-Type", " header") ;
   }
   x = tipidee_headers_search(hdr, "Content-Length") ;