Skip to content

clean ':' from filenames on macOS #8168

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
bwrightkc wants to merge 4 commits into
base: RC_2_0
Choose a base branch
from
Open

clean ':' from filenames on macOS #8168

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
d42222c
Update torrent_info.cpp
bwrightkc Feb 24, 2026
15cfde7
Update test_torrent_info.cpp
bwrightkc Mar 6, 2026
c355aae
Update test_torrent_info.cpp
bwrightkc Mar 7, 2026
54345e8
Update src/torrent_info.cpp
bwrightkc Mar 7, 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
3 changes: 3 additions & 0 deletions src/torrent_info.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,6 +101,9 @@ namespace libtorrent {
// style filesystems, which also further restricts valid characters
// https://cs.android.com/android/platform/superproject/+/master:frameworks/base/core/java/android/os/FileUtils.java;l=997?q=isValidFatFilenameChar
static const char invalid_chars[] = "\"*:<>?|";
// macOS does not permit use of a colon in a file or folder name
#elif defined __APPLE__
static const char invalid_chars[] = ":";
#else
static const char invalid_chars[] = "";
#endif
Expand Down
14 changes: 7 additions & 7 deletions test/test_torrent_info.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -725,7 +725,7 @@ TORRENT_TEST(sanitize_path)

path.clear();
sanitize_append_path_element(path, "dev:");
#ifdef TORRENT_WINDOWS
#if defined TORRENT_WINDOWS || defined __APPLE__
TEST_EQUAL(path, "dev_");
#else
TEST_EQUAL(path, "dev:");
Expand All @@ -734,7 +734,7 @@ TORRENT_TEST(sanitize_path)
path.clear();
sanitize_append_path_element(path, "c:");
sanitize_append_path_element(path, "b");
#ifdef TORRENT_WINDOWS
#if defined TORRENT_WINDOWS || defined __APPLE__
TEST_EQUAL(path, "c_" SEPARATOR "b");
#else
TEST_EQUAL(path, "c:" SEPARATOR "b");
Expand All @@ -744,7 +744,7 @@ TORRENT_TEST(sanitize_path)
sanitize_append_path_element(path, "c:");
sanitize_append_path_element(path, ".");
sanitize_append_path_element(path, "c");
#ifdef TORRENT_WINDOWS
#if defined TORRENT_WINDOWS || defined __APPLE__
TEST_EQUAL(path, "c_" SEPARATOR "c");
#else
TEST_EQUAL(path, "c:" SEPARATOR "c");
Expand Down Expand Up @@ -913,7 +913,7 @@ TORRENT_TEST(sanitize_path_force)

path.clear();
sanitize_append_path_element(path, "dev:", true);
#ifdef TORRENT_WINDOWS
#if defined TORRENT_WINDOWS || defined __APPLE__
TEST_EQUAL(path, "dev_");
#else
TEST_EQUAL(path, "dev:");
Expand All @@ -922,7 +922,7 @@ TORRENT_TEST(sanitize_path_force)
path.clear();
sanitize_append_path_element(path, "c:", true);
sanitize_append_path_element(path, "b", true);
#ifdef TORRENT_WINDOWS
#if defined TORRENT_WINDOWS || defined __APPLE__
TEST_EQUAL(path, "c_" SEPARATOR "b");
#else
TEST_EQUAL(path, "c:" SEPARATOR "b");
Expand All @@ -932,7 +932,7 @@ TORRENT_TEST(sanitize_path_force)
sanitize_append_path_element(path, "c:", true);
sanitize_append_path_element(path, ".", true);
sanitize_append_path_element(path, "c", true);
#ifdef TORRENT_WINDOWS
#if defined TORRENT_WINDOWS || defined __APPLE__
TEST_EQUAL(path, "c_" SEPARATOR "_" SEPARATOR "c");
#else
TEST_EQUAL(path, "c:" SEPARATOR "_" SEPARATOR "c");
Expand Down Expand Up @@ -1082,7 +1082,7 @@ TORRENT_TEST(sanitize_path_colon)
using lt::aux::sanitize_append_path_element;
std::string path;
sanitize_append_path_element(path, "foo:bar");
#ifdef TORRENT_WINDOWS
#if defined TORRENT_WINDOWS || defined __APPLE__
TEST_EQUAL(path, "foo_bar");
#else
TEST_EQUAL(path, "foo:bar");
Expand Down
Loading