Add support for glob in file loader and support for absolute paths in metacall.json path field.

Author: viferga

source/loader/source/loader.c

@@ -426,13 +426,20 @@ int loader_load_from_configuration(const loader_path path, void **handle, void *
 
 		size_t str_size = value_type_size(context_path);
 
-		loader_path path_base, join_path;
+		if (portability_path_is_absolute(str, str_size) == 0)
+		{
+			context_path_size = portability_path_canonical(str, str_size, context_path_str, LOADER_PATH_SIZE);
+		}
+		else
+		{
+			loader_path path_base, join_path;
 
-		size_t path_base_size = portability_path_get_directory(path, strnlen(path, LOADER_PATH_SIZE) + 1, path_base, LOADER_PATH_SIZE);
+			size_t path_base_size = portability_path_get_directory(path, strnlen(path, LOADER_PATH_SIZE) + 1, path_base, LOADER_PATH_SIZE);
 
-		size_t join_path_size = portability_path_join(path_base, path_base_size, str, str_size, join_path, LOADER_PATH_SIZE);
+			size_t join_path_size = portability_path_join(path_base, path_base_size, str, str_size, join_path, LOADER_PATH_SIZE);
 
-		context_path_size = portability_path_canonical(join_path, join_path_size, context_path_str, LOADER_PATH_SIZE);
+			context_path_size = portability_path_canonical(join_path, join_path_size, context_path_str, LOADER_PATH_SIZE);
+		}
 	}
 
 	scripts_array = value_to_array(scripts);

source/loaders/file_loader/source/file_loader_impl.c

@@ -66,6 +66,21 @@ typedef struct stat file_stat_type;
 
 #endif
 
+/* Support for glob, only in POSIX for now */
+#if !defined(_WIN32) &&                                                                     \
+	(defined(unix) || defined(__unix__) || defined(__unix) ||                               \
+		defined(linux) || defined(__linux__) || defined(__linux) || defined(__gnu_linux) || \
+		defined(__CYGWIN__) || defined(__CYGWIN32__) ||                                     \
+		(defined(__APPLE__) && defined(__MACH__)) || defined(__MACOSX__))
+
+	#include <unistd.h>
+
+	#if defined(_POSIX_VERSION)
+		#define FILE_LOADER_GLOB_SUPPORT 1
+		#include <glob.h>
+	#endif
+#endif
+
 typedef struct loader_impl_file_descriptor_type
 {
 	loader_path path;
@@ -92,6 +107,7 @@ typedef struct loader_impl_file_function_type
 } * loader_impl_file_function;
 
 static int file_loader_impl_load_path(loader_impl_file_handle handle, const loader_path path, size_t path_size);
+static int file_loader_impl_load_glob(loader_impl_file_handle handle, const loader_path path, size_t path_size);
 static int file_loader_impl_load_execution_path(loader_impl_file file_impl, loader_impl_file_handle handle, const loader_path path);
 
 int function_file_interface_create(function func, function_impl impl)
@@ -253,13 +269,61 @@ int file_loader_impl_load_path(loader_impl_file_handle handle, const loader_path
 	return 1;
 }
 
+int file_loader_impl_load_glob(loader_impl_file_handle handle, const loader_path path, size_t path_size)
+{
+	glob_t glob_result;
+
+	(void)path_size;
+
+	memset(&glob_result, 0, sizeof(glob_result));
+
+	if (glob(path, GLOB_TILDE, NULL, &glob_result) != 0)
+	{
+		globfree(&glob_result);
+		return 1;
+	}
+
+	size_t i, loaded_files = 0;
+
+	for (i = 0; i < glob_result.gl_pathc; ++i)
+	{
+		loader_path glob_path;
+		size_t length = strnlen(glob_result.gl_pathv[i], LOADER_PATH_SIZE);
+
+		strncpy(glob_path, glob_result.gl_pathv[i], length);
+
+		glob_path[length] = '\0';
+
+		if (file_loader_impl_load_path(handle, glob_path, length + 1) == 0)
+		{
+			++loaded_files;
+		}
+	}
+
+	globfree(&glob_result);
+
+	return (loaded_files == 0);
+}
+
 int file_loader_impl_load_execution_path(loader_impl_file file_impl, loader_impl_file_handle handle, const loader_path path)
 {
 	size_t path_size = strnlen(path, LOADER_PATH_SIZE) + 1;
+	int (*impl_load_path)(loader_impl_file_handle, const loader_path, size_t);
+
+#if defined(FILE_LOADER_GLOB_SUPPORT)
+	if (portability_path_is_pattern(path, path_size) == 0)
+	{
+		impl_load_path = &file_loader_impl_load_glob;
+	}
+	else
+#endif
+	{
+		impl_load_path = &file_loader_impl_load_path;
+	}
 
 	if (portability_path_is_absolute(path, path_size) == 0)
 	{
-		return file_loader_impl_load_path(handle, path, path_size);
+		return impl_load_path(handle, path, path_size);
 	}
 	else
 	{
@@ -271,7 +335,7 @@ int file_loader_impl_load_execution_path(loader_impl_file file_impl, loader_impl
 			loader_path absolute_path;
 			size_t absolute_path_size = portability_path_join(*execution_path, strnlen(*execution_path, LOADER_PATH_SIZE) + 1, path, path_size, absolute_path, LOADER_PATH_SIZE);
 
-			if (file_loader_impl_load_path(handle, absolute_path, absolute_path_size) == 0)
+			if (impl_load_path(handle, absolute_path, absolute_path_size) == 0)
 			{
 				return 0;
 			}

source/portability/include/portability/portability_path.h

@@ -125,14 +125,16 @@ PORTABILITY_API size_t portability_path_get_relative(const char *base, size_t ba
 
 PORTABILITY_API int portability_path_is_subpath(const char *parent, size_t parent_size, const char *child, size_t child_size);
 
-PORTABILITY_API int portability_path_is_absolute(const char *path, size_t path_size);
+PORTABILITY_API int portability_path_is_absolute(const char *path, size_t size);
 
 PORTABILITY_API size_t portability_path_join(const char *left_path, size_t left_path_size, const char *right_path, size_t right_path_size, char *join_path, size_t join_size);
 
 PORTABILITY_API size_t portability_path_canonical(const char *path, size_t path_size, char *canonical, size_t canonical_size);
 
 PORTABILITY_API int portability_path_compare(const char *left_path, const char *right_path);
 
+PORTABILITY_API int portability_path_is_pattern(const char *path, size_t size);
+
 #ifdef __cplusplus
 }
 #endif

source/portability/source/portability_path.c

@@ -231,15 +231,15 @@ int portability_path_is_subpath(const char *parent, size_t parent_size, const ch
 	return !(strncmp(parent, child, parent_size) == 0);
 }
 
-int portability_path_is_absolute(const char *path, size_t path_size)
+int portability_path_is_absolute(const char *path, size_t size)
 {
 	if (path == NULL)
 	{
 		return 1;
 	}
 
 #if defined(WIN32) || defined(_WIN32)
-	if (path_size < 3)
+	if (size < 3)
 	{
 		return 1;
 	}
@@ -253,7 +253,7 @@ int portability_path_is_absolute(const char *path, size_t path_size)
 	(defined(__APPLE__) && defined(__MACH__)) || defined(__MACOSX__) ||                 \
 	defined(__HAIKU__) || defined(__BEOS__)
 
-	if (path_size < 1)
+	if (size < 1)
 	{
 		return 1;
 	}
@@ -462,3 +462,23 @@ int portability_path_compare(const char *left_path, const char *right_path)
 
 	return (strncmp(left_path, right_path, left_length) != 0);
 }
+
+int portability_path_is_pattern(const char *path, size_t size)
+{
+	if (path == NULL || size == 0)
+	{
+		return 1;
+	}
+
+	size_t i;
+
+	for (i = 0; path[i] != '\0' && i < size; ++i)
+	{
+		if (path[i] == '*')
+		{
+			return 0;
+		}
+	}
+
+	return 1;
+}

source/scripts/file/CMakeLists.txt

@@ -15,3 +15,4 @@ include(FileProject)
 
 add_subdirectory(static)
 add_subdirectory(favicon)
+add_subdirectory(glob)

source/scripts/file/glob/CMakeLists.txt

@@ -0,0 +1,5 @@
+#
+# Configure file project
+#
+
+file_project(glob 0.1.0)

source/scripts/file/glob/source/glob/a.txt

@@ -0,0 +1,7 @@
+{
+    "language_id": "file",
+    "path": ".",
+    "scripts": [
+        "./glob/*.txt"
+    ]
+}