Skip to content

Fix path construction in configure_drivers directory iteration #15

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
JohnAmadis merged 2 commits into from
Feb 8, 2026
Merged

Fix path construction in configure_drivers directory iteration #15

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
36d8197
Initial plan
Copilot Feb 8, 2026
3b73e3b
Fix incorrect directory iteration in configure_drivers - use absolute…
Copilot Feb 8, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 26 additions & 6 deletions src/dmdevfs.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -799,20 +799,40 @@ static int configure_drivers(dmfsi_context_t ctx, const char* driver_name, const
void* dir = Dmod_OpenDir(config_path);
if (dir == NULL)
{
DMOD_LOG_ERROR("Failed to open config directory: %s\n", ctx->config_path);
DMOD_LOG_ERROR("Failed to open config directory: %s\n", config_path);
return DMFSI_ERR_NOT_FOUND;
}

const char* entry;
while ((entry = Dmod_ReadDir(dir)) != NULL)
{
if (is_file(entry))
// Construct full path for the entry
char full_path[MAX_PATH_LENGTH];
size_t config_path_len = strlen(config_path);
size_t entry_len = strlen(entry);

// Check if we need a separator
bool needs_separator = (config_path_len > 0 && config_path[config_path_len - 1] != '/');
size_t required_len = config_path_len + (needs_separator ? 1 : 0) + entry_len + 1;

if (required_len > MAX_PATH_LENGTH)
{
DMOD_LOG_ERROR("Path too long: %s/%s\n", config_path, entry);
continue;
}

Dmod_SnPrintf(full_path, sizeof(full_path), "%s%s%s",
config_path,
needs_separator ? "/" : "",
entry);

if (is_file(full_path))
{
char module_name[DMOD_MAX_MODULE_NAME_LENGTH];
dmini_context_t config_ctx = read_driver_for_config(entry, module_name, sizeof(module_name), driver_name);
dmini_context_t config_ctx = read_driver_for_config(full_path, module_name, sizeof(module_name), driver_name);
if (config_ctx == NULL)
{
DMOD_LOG_ERROR("Failed to read driver for config: %s\n", entry);
DMOD_LOG_ERROR("Failed to read driver for config: %s\n", full_path);
continue;
}

Expand All @@ -835,10 +855,10 @@ static int configure_drivers(dmfsi_context_t ctx, const char* driver_name, const
// read driver name from directory name
char module_name[DMOD_MAX_MODULE_NAME_LENGTH];
read_base_name(entry, module_name, sizeof(module_name));
int res = configure_drivers(ctx, driver_name, entry);
int res = configure_drivers(ctx, driver_name, full_path);
if (res != DMFSI_OK)
{
DMOD_LOG_ERROR("Failed to configure drivers in directory: %s\n", entry);
DMOD_LOG_ERROR("Failed to configure drivers in directory: %s\n", full_path);
}
}
}
Expand Down