From 7e984e3e01a377e5fe33f565c1846de3c4d98709 Mon Sep 17 00:00:00 2001
From: Mattias Andrée <maandree@operamail.com>
Date: Sun, 30 Nov 2014 14:33:44 +0100
Subject: mds-kbdc: detect resursive inclusion
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Mattias Andrée <maandree@operamail.com>
---
 src/mds-kbdc/process-includes.c | 51 +++++++++++++++++++++++++++++++++++++++--
 1 file changed, 49 insertions(+), 2 deletions(-)

(limited to 'src')

diff --git a/src/mds-kbdc/process-includes.c b/src/mds-kbdc/process-includes.c
index 8c4bbbf..64dd7eb 100644
--- a/src/mds-kbdc/process-includes.c
+++ b/src/mds-kbdc/process-includes.c
@@ -16,7 +16,6 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #include "process-includes.h"
-/* TODO we need to deal with mutually recursive includes */
 
 #include "make-tree.h"
 #include "simplify-tree.h"
@@ -25,6 +24,8 @@
 #include <unistd.h>
 #include <string.h>
 #include <stdlib.h>
+#include <sys/types.h>
+#include <sys/stat.h>
 
 
 
@@ -57,6 +58,21 @@ static mds_kbdc_parse_error_t* error;
  */
 static mds_kbdc_parsed_t* restrict result;
 
+/**
+ * Stack of attributes of already included files
+ */
+static struct stat* included;
+
+/**
+ * The number elements allocated for `included`
+ */
+static size_t included_size = 0;
+
+/**
+ * The number elements stored in `included`
+ */
+static size_t included_ptr = 0;
+
 
 
 /**
@@ -256,8 +272,39 @@ static int process_includes_in_tree(mds_kbdc_tree_t* restrict tree)
  */
 int process_includes(mds_kbdc_parsed_t* restrict result_)
 {
+  int r, saved_errno;
+  struct stat attr;
+  size_t i;
+  
   result = result_;
-  return process_includes_in_tree(result_->tree);
+  
+  fail_if (stat(result->pathname, &attr));
+  
+  if (included_ptr == included_size)
+    {
+      struct stat* old;
+      if (xxrealloc(old, included, included_size += 4, struct stat))
+	return included = old, -1;
+    }
+  
+  for (i = 0; i < included_ptr; i++)
+    if ((included[i].st_dev == attr.st_dev) && (included[i].st_ino == attr.st_ino))
+      {
+	NEW_ERROR_(result, ERROR, 0, 0, 0, 0, 1, "resursive inclusion");
+	return 0;
+      }
+  
+  included[included_ptr++] = attr;
+  
+  r = process_includes_in_tree(result_->tree);
+  saved_errno = errno;
+  
+  if (--included_ptr == 0)
+    free(included), included_size = 0;
+  
+  return errno = saved_errno, r;
+ pfail:
+  return -1;
 }
 
 
-- 
cgit v1.2.3-70-g09d2