[config][relative] Convert relative "extra paths" to absolute

Also fixes a infinite loop which occured with relative paths.

Author: thoni56

doc/user-manual.adoc

@@ -38,44 +38,43 @@ If no config file could be found, you'll be prompted to create a project. The ac
 
 === Project Configuration
 
-The `.c-xrefrc` file defines which files belong to the project. A minimal config
-looks like:
+The `.c-xrefrc` file marks the root of a source tree. The directory containing
+`.c-xrefrc` and its subdirectories are always scanned for compilation units. A
+minimal config only needs a section header naming the project:
 
 [source]
 ----
-[/path/to/project]
-  /path/to/project
+[my-project]
 ----
 
-The section header `[...]` names the project (typically the project root path).
+The section header `[...]` names the project.
 Lines below it configure the project:
 
-Source directories:: Bare path lines list directories to scan for compilation units.
-  The project root is always scanned. Additional directories can be listed for
-  multi-directory or multi-repo projects:
+Source directories:: The project root (where `.c-xrefrc` lives) and its
+  subdirectories are always scanned automatically. Additional source directories
+  only need to be listed for multi-directory projects, e.g. when source files
+  live outside the project root:
 +
 [source]
 ----
-[/path/to/project]
-  /path/to/project
-  /path/to/shared/library
+[my-project]
+  ../shared/library
 ----
 
 Include paths:: `-I` options tell c-xrefactory where to find header files, just
   like the compiler flag:
 +
 [source]
 ----
-[/path/to/project]
-  /path/to/project
-  -I /path/to/external/headers
+[my-project]
+  -I ../external/headers
 ----
 
 Preprocessor defines:: `-D` options define macros, equivalent to the compiler flag.
   Useful when the project uses conditional compilation.
 
-TIP: For projects that use auto-detection (project-local `.c-xrefrc`), absolute paths
-are not required — the configuration is resolved relative to the file's location.
+TIP: Paths in `.c-xrefrc` are resolved relative to the config file's directory,
+so the configuration is portable and can be checked into version control.
 
 == Browsing
 

src/editorbuffer.c

@@ -39,9 +39,7 @@ EditorBuffer *newEditorBuffer(char *realFileName, int fileNumber, char *preLoade
 
 EditorBuffer *createNewEditorBuffer(char *realFileName, char *preLoadedFromFile, time_t modificationTime,
                                     size_t size) {
-    char safeFileName[MAX_FILE_NAME_SIZE];
-    strcpy(safeFileName, realFileName);
-    char *normalizedRealFileName = strdup(normalizeFileName_static(safeFileName, cwd));
+    char *normalizedRealFileName = strdup(normalizeFileName_static(realFileName, cwd));
 
     assert(preLoadedFromFile == NULL || strcmp(realFileName, preLoadedFromFile) != 0);
     char *normalizedLoadedFromFile = NULL;

src/main.c

@@ -12,6 +12,7 @@
 #include "lsp.h"
 #include "memory.h"
 #include "proto.h"
+#include "refactory.h"
 #include "server.h"
 #include "stackmemory.h"
 #include "startup.h"

src/projectstructure.c

@@ -9,6 +9,7 @@
 #include "stringlist.h"
 #include "yylex.h"
 
+
 #define SCAN_BUFFER_SIZE 4096
 
 /* Resolve an include path: try includer's directory first, then walk

src/startup.c

@@ -550,9 +550,12 @@ static void loadProjectSettings(ArgumentsVector baseArgs, ArgumentsVector reques
     {
         ArgumentsVector configArgs = readOptionsFromFile(projectConfigFileName,
                                                           projectSectionName, projectSectionName);
+        char *configDir = directoryName_static(projectConfigFileName);
         for (int i = 1; i < configArgs.argc; i++) {
             if (configArgs.argv[i][0] != '-') {
-                projectConfig.sourceDirs = newStringList(configArgs.argv[i],
+                char absolutePath[MAX_FILE_NAME_SIZE];
+                strcpy(absolutePath, normalizeFileName_static(configArgs.argv[i], configDir));
+                projectConfig.sourceDirs = newStringList(absolutePath,
                                                           projectConfig.sourceDirs);
             }
         }