Skip to content

Fix subdirectory listing under /dev mount point #37

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
Mar 11, 2026
Merged

Fix subdirectory listing under /dev mount point #37

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9670163
Initial plan
Copilot Mar 11, 2026
7729fbf
Fix directory listing for /dev subdirectories
Copilot Mar 11, 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
20 changes: 10 additions & 10 deletions src/dmdevfs.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1161,16 +1161,16 @@ static void read_dir_name_from_path(const char* path, char* dir_name, size_t nam

/**
* @brief Extract the first path component of full_path that comes after base_path
* @param base_path The directory currently being listed (e.g., "/" or "foo/")
* @param full_path The driver's parent directory path (e.g., "foo/bar/")
* @param base_path The directory currently being listed (e.g., "/" or "/foo")
* @param full_path The driver's parent directory path (e.g., "/foo/bar/")
* @param dir_name Output buffer for the immediate subdirectory name
* @param name_size Size of the output buffer
*
* Examples:
* - base="/", full="dmgpio8/" -> "dmgpio8"
* - base="/", full="a/b/c/" -> "a"
* - base="a/", full="a/b/c/" -> "b"
* - base="a/b/", full="a/b/c/" -> "c"
* - base="/", full="/dmgpio8/" -> "dmgpio8"
* - base="/", full="/a/b/c/" -> "a"
* - base="/a", full="/a/b/c/" -> "b"
* - base="/a/b", full="/a/b/c/" -> "c"
*/
static void read_next_subdir_name(const char* base_path, const char* full_path, char* dir_name, size_t name_size)
{
Expand All @@ -1193,8 +1193,8 @@ static void read_next_subdir_name(const char* base_path, const char* full_path,
const char* start;
if (base_len == 1 && base_path[0] == '/')
{
// Base is the root directory; full_path has no leading slash
start = full_path;
// Base is the root directory; skip the leading '/' in full_path if present
start = (full_path[0] == '/') ? full_path + 1 : full_path;
}
else
{
Expand Down Expand Up @@ -1327,11 +1327,11 @@ static int read_driver_parent_directory( const driver_node_t* node, char* path_b
bool minor_given = (node->dev_num.flags & DMDRVI_NUM_MINOR) != 0;
if(major_given && minor_given)
{
Dmod_SnPrintf(path_buffer, buffer_size, "%s%u/", driver_name, node->dev_num.major);
Dmod_SnPrintf(path_buffer, buffer_size, "/%s%u/", driver_name, node->dev_num.major);
}
else if(minor_given)
{
Dmod_SnPrintf(path_buffer, buffer_size, "%sx/", driver_name);
Dmod_SnPrintf(path_buffer, buffer_size, "/%sx/", driver_name);
}
else
{
Expand Down
Loading