Bug #1593: multiline configs garbled in cache manager

Patch provided by Gonzalo Arana.

diff --git a/src/cache_cf.cc b/src/cache_cf.cc
index 818003142f7d3c02ba677839e05f2173ca6ecb5c..c1272f7ed4f53ba3ed8ec0c35fd1a362d25ecf3c 100644 (file)
--- a/src/cache_cf.cc
+++ b/src/cache_cf.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: cache_cf.cc,v 1.498 2006/05/30 17:31:23 hno Exp $
+ * $Id: cache_cf.cc,v 1.499 2006/06/14 19:52:54 serassio Exp $
  *
  * DEBUG: section 3     Configuration File Parsing
  * AUTHOR: Harvest Derived
@@ -206,6 +206,15 @@ SetConfigFilename(char const *file_name, bool is_pipe)
         cfg_filename = token + 1;
 }
 
+static const char*
+skip_ws(const char* s)
+{
+    while (xisspace(*s))
+        ++s;
+
+    return s;
+}
+
 int
 parseConfigFile(const char *file_name, CacheManager & manager)
 {
@@ -291,13 +300,15 @@ parseConfigFile(const char *file_name, CacheManager & manager)
         if (config_input_line[0] == '\0')
             continue;
 
-        size_t config_input_line_len = strlen(config_input_line);
+        const char* append = tmp_line_len ? skip_ws(config_input_line) : config_input_line;
+
+        size_t append_len = strlen(append);
 
-        tmp_line = (char*)xrealloc(tmp_line, tmp_line_len + config_input_line_len + 1);
+        tmp_line = (char*)xrealloc(tmp_line, tmp_line_len + append_len + 1);
 
-        strcpy(tmp_line + tmp_line_len, config_input_line);
+        strcpy(tmp_line + tmp_line_len, append);
 
-        tmp_line_len += config_input_line_len;
+        tmp_line_len += append_len;
 
         if (tmp_line[tmp_line_len-1] == '\\') {
             debug(3, 5) ("parseConfigFile: tmp_line='%s'\n", tmp_line);