From: Alan T. DeKok <aland@freeradius.org>
Date: Fri, 1 Mar 2013 01:19:14 +0000 (-0500)
Subject: Properly track relative / absolute filenames
X-Git-Tag: release_3_0_0_beta1~892
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=90c007acb86afd5379b2fefc02834c6a54af2cc6;p=thirdparty%2Ffreeradius-server.git

Properly track relative / absolute filenames

So we can do the following:

top:		$INCLUDE foo/bar
foo/bar:	$INCLUDE baz
foo/baz		stuff

Which makes file tracking nice
---

diff --git a/src/lib/dict.c b/src/lib/dict.c
index f93ffd9677a..5a021ec3b61 100644
--- a/src/lib/dict.c
+++ b/src/lib/dict.c
@@ -1876,11 +1876,11 @@ int str2argv(char *str, char **argv, int max_argc)
 /*
  *	Initialize the dictionary.
  */
-static int my_dict_init(const char *dir, const char *fn,
+static int my_dict_init(const char *parent, const char *filename,
 			const char *src_file, int src_line)
 {
 	FILE	*fp;
-	char 	dirtmp[256];
+	char 	dir[256], fn[256];
 	char	buf[256];
 	char	*p;
 	int	line = 0;
@@ -1897,25 +1897,45 @@ static int my_dict_init(const char *dir, const char *fn,
 	block_tlv[2] = NULL;
 	block_tlv[3] = NULL;
 
-	if (strlen(fn) >= sizeof(dirtmp) / 2 ||
-	    strlen(dir) >= sizeof(dirtmp) / 2) {
+	if ((strlen(parent) + 3 + strlen(filename)) > sizeof(dir)) {
 		fr_strerror_printf("dict_init: filename name too long");
 		return -1;
 	}
 
 	/*
-	 *	First see if fn is relative to dir. If so, create
-	 *	new filename. If not, remember the absolute dir.
+	 *	If it's an absolute dir, forget the parent dir,
+	 *	and remember the new one.
+	 *
+	 *	If it's a relative dir, tack on the current filename
+	 *	to the parent dir.  And use that.
 	 */
-	if ((p = strrchr(fn, FR_DIR_SEP)) != NULL) {
-		strcpy(dirtmp, fn);
-		dirtmp[p - fn] = 0;
-		dir = dirtmp;
-	} else if (dir[0] && strcmp(dir, ".") != 0) {
-		snprintf(dirtmp, sizeof(dirtmp), "%s/%s", dir, fn);
-		fn = dirtmp;
+	if (!FR_DIR_IS_RELATIVE(filename)) {
+		strlcpy(dir, filename, sizeof(dir));
+		p = strrchr(dir, FR_DIR_SEP);
+		if (p) p[1] = '\0';
+
+		strlcpy(fn, filename, sizeof(fn));
+	} else {
+		strlcpy(dir, parent, sizeof(dir));
+		p = strrchr(dir, FR_DIR_SEP);
+		if (p && p[1]) strlcat(dir, "/", sizeof(dir));
+		strlcat(dir, filename, sizeof(dir));
+		p = strrchr(dir, FR_DIR_SEP);
+		if (p) p[1] = '\0';
+
+		p = strrchr(filename, FR_DIR_SEP);
+		if (p) {
+			snprintf(fn, sizeof(fn), "%s%s", dir, p);
+		} else {
+			snprintf(fn, sizeof(fn), "%s%s", dir, filename);
+		}
+
 	}
 
+	fprintf(stderr, "PARENT %s %s FINAL %s %s\n",
+		parent, filename, dir, fn);
+
+
 	if ((fp = fopen(fn, "r")) == NULL) {
 		if (!src_file) {
 			fr_strerror_printf("dict_init: Couldn't open dictionary \"%s\": %s",