Skip to content

CFE-4623: Fixed missing directory file separator suffix #263

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

Open
victormlg wants to merge 2 commits into
base: master
Choose a base branch
from
Open

CFE-4623: Fixed missing directory file separator suffix #263

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
311a4d8
Fixed missing directory file separator suffix
victormlg Feb 16, 2026
a7a2735
Fixed unit tests for directory separator suffix
victormlg Feb 16, 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
9 changes: 7 additions & 2 deletions libutils/glob_lib.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -432,7 +432,9 @@ static void PathWalkCallback(
{
/* We have matched each and every part of the glob pattern, thus we
* have a full match. */
char *const match = xstrdup(dirpath);
char *match;
xasprintf(&match, "%s" FILE_SEPARATOR_STR, dirpath);

SeqAppend(data->matches, match);
Log(LOG_LEVEL_DEBUG,
"Full match! Directory '%s' has matched all previous sub patterns",
Expand Down Expand Up @@ -679,7 +681,10 @@ StringSet *GlobFileList(const char *pattern)
{
for (size_t j = 0; j < globbuf.gl_pathc; j++)
{
StringSetAdd(set, SafeStringDuplicate(globbuf.gl_pathv[j]));
char *path = IsDirReal(globbuf.gl_pathv[j])
? StringFormat("%s" FILE_SEPARATOR_STR, globbuf.gl_pathv[j])
: SafeStringDuplicate(globbuf.gl_pathv[j]);
StringSetAdd(set, path);
}
globfree(&globbuf);
}
Expand Down
22 changes: 11 additions & 11 deletions tests/unit/glob_lib_test.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -271,7 +271,7 @@ static void test_glob_find(void)
{
Seq *const matches = GlobFind(".");
assert_int_equal(SeqLength(matches), 1);
assert_string_equal(SeqAt(matches, 0), ".");
assert_string_equal(SeqAt(matches, 0), "." FILE_SEPARATOR_STR);
SeqDestroy(matches);
}
}
Expand All @@ -289,10 +289,10 @@ static void test_glob_file_list(void)
// Create test subdirectories.

static const char *const test_subdirs[] = {
"foo",
"foo" FILE_SEPARATOR_STR "bar",
"foo" FILE_SEPARATOR_STR "bar" FILE_SEPARATOR_STR "baz",
"qux",
"foo" FILE_SEPARATOR_STR,
"foo" FILE_SEPARATOR_STR "bar" FILE_SEPARATOR_STR,
"foo" FILE_SEPARATOR_STR "bar" FILE_SEPARATOR_STR "baz" FILE_SEPARATOR_STR,
"qux" FILE_SEPARATOR_STR,
};
const size_t num_test_subdirs =
sizeof(test_subdirs) / sizeof(const char *);
Expand Down Expand Up @@ -471,14 +471,14 @@ static void test_glob_file_list(void)
matches = GlobFileList(pattern);
assert_int_equal(StringSetSize(matches), 4);

ret = snprintf(path, PATH_MAX, "%s" FILE_SEPARATOR_STR "foo", test_dir);
ret = snprintf(path, PATH_MAX, "%s" FILE_SEPARATOR_STR "foo" FILE_SEPARATOR_STR, test_dir);
assert_true(ret < PATH_MAX && ret >= 0);
assert_true(StringSetContains(matches, path));

ret = snprintf(
path,
PATH_MAX,
"%s" FILE_SEPARATOR_STR "foo" FILE_SEPARATOR_STR "bar",
"%s" FILE_SEPARATOR_STR "foo" FILE_SEPARATOR_STR "bar" FILE_SEPARATOR_STR,
test_dir);
assert_true(ret < PATH_MAX && ret >= 0);
assert_true(StringSetContains(matches, path));
Expand All @@ -487,12 +487,12 @@ static void test_glob_file_list(void)
path,
PATH_MAX,
"%s" FILE_SEPARATOR_STR "foo" FILE_SEPARATOR_STR
"bar" FILE_SEPARATOR_STR "baz",
"bar" FILE_SEPARATOR_STR "baz" FILE_SEPARATOR_STR,
test_dir);
assert_true(ret < PATH_MAX && ret >= 0);
assert_true(StringSetContains(matches, path));

ret = snprintf(path, PATH_MAX, "%s" FILE_SEPARATOR_STR "qux", test_dir);
ret = snprintf(path, PATH_MAX, "%s" FILE_SEPARATOR_STR "qux" FILE_SEPARATOR_STR, test_dir);
assert_true(ret < PATH_MAX && ret >= 0);
assert_true(StringSetContains(matches, path));

Expand Down Expand Up @@ -676,14 +676,14 @@ static void test_glob_file_list(void)

assert_int_equal(StringSetSize(matches), 2);

ret = snprintf(path, PATH_MAX, "%s" FILE_SEPARATOR_STR "foo", test_dir);
ret = snprintf(path, PATH_MAX, "%s" FILE_SEPARATOR_STR "foo" FILE_SEPARATOR_STR, test_dir);
assert_true(ret < PATH_MAX && ret >= 0);
assert_true(StringSetContains(matches, path));

ret = snprintf(
path,
PATH_MAX,
"%s" FILE_SEPARATOR_STR "foo" FILE_SEPARATOR_STR "bar",
"%s" FILE_SEPARATOR_STR "foo" FILE_SEPARATOR_STR "bar" FILE_SEPARATOR_STR,
test_dir);
assert_true(ret < PATH_MAX && ret >= 0);
assert_true(StringSetContains(matches, path));
Expand Down
Loading