Ensure that the directory name always ends with /

[freeradius.git] / src / lib / dict.c

diff --git a/src/lib/dict.c b/src/lib/dict.c
index 5a021ec..a3ea796 100644 (file)
--- a/src/lib/dict.c
+++ b/src/lib/dict.c
@@ -1912,16 +1912,28 @@ static int my_dict_init(const char *parent, const char *filename,
        if (!FR_DIR_IS_RELATIVE(filename)) {
                strlcpy(dir, filename, sizeof(dir));
                p = strrchr(dir, FR_DIR_SEP);
-               if (p) p[1] = '\0';
+               if (p) {
+                       p[1] = '\0';
+               } else {
+                       strlcat(dir, "/", sizeof(dir));
+               }
 
                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));
+               if (p) {
+                       if (p[1]) strlcat(dir, "/", sizeof(dir));
+               } else {
+                       strlcat(dir, "/", sizeof(dir));
+               }
                strlcat(dir, filename, sizeof(dir));
                p = strrchr(dir, FR_DIR_SEP);
-               if (p) p[1] = '\0';
+               if (p) {
+                       p[1] = '\0';
+               } else {
+                       strlcat(dir, "/", sizeof(dir));
+               }
 
                p = strrchr(filename, FR_DIR_SEP);
                if (p) {
@@ -1932,10 +1944,6 @@ static int my_dict_init(const char *parent, const char *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",