diff --git a/src/node_file.cc b/src/node_file.cc index a96e37d414d2af..32df2217403c0d 100644 --- a/src/node_file.cc +++ b/src/node_file.cc @@ -842,19 +842,6 @@ void AfterOpenFileHandle(uv_fs_t* req) { } } -// Reverse the logic applied by path.toNamespacedPath() to create a -// namespace-prefixed path. -void FromNamespacedPath(std::string* path) { -#ifdef _WIN32 - if (path->compare(0, 8, "\\\\?\\UNC\\", 8) == 0) { - *path = path->substr(8); - path->insert(0, "\\\\"); - } else if (path->compare(0, 4, "\\\\?\\", 4) == 0) { - *path = path->substr(4); - } -#endif -} - void AfterMkdirp(uv_fs_t* req) { FSReqBase* req_wrap = FSReqBase::from_req(req); FSReqAfterScope after(req_wrap, req); @@ -864,7 +851,7 @@ void AfterMkdirp(uv_fs_t* req) { std::string first_path(req_wrap->continuation_data()->first_path()); if (first_path.empty()) return req_wrap->Resolve(Undefined(req_wrap->env()->isolate())); - FromNamespacedPath(&first_path); + node::url::FromNamespacedPath(&first_path); Local path; Local error; if (!StringBytes::Encode(req_wrap->env()->isolate(), first_path.c_str(), @@ -1790,7 +1777,7 @@ static void MKDir(const FunctionCallbackInfo& args) { if (!req_wrap_sync.continuation_data()->first_path().empty()) { Local error; std::string first_path(req_wrap_sync.continuation_data()->first_path()); - FromNamespacedPath(&first_path); + node::url::FromNamespacedPath(&first_path); MaybeLocal path = StringBytes::Encode(env->isolate(), first_path.c_str(), UTF8, &error); @@ -2900,7 +2887,7 @@ void BindingData::LegacyMainResolve(const FunctionCallbackInfo& args) { return; } - FromNamespacedPath(&initial_file_path.value()); + node::url::FromNamespacedPath(&initial_file_path.value()); for (int i = 0; i < legacy_main_extensions_with_main_end; i++) { file_path = *initial_file_path + std::string(legacy_main_extensions[i]); @@ -2935,7 +2922,7 @@ void BindingData::LegacyMainResolve(const FunctionCallbackInfo& args) { return; } - FromNamespacedPath(&initial_file_path.value()); + node::url::FromNamespacedPath(&initial_file_path.value()); for (int i = legacy_main_extensions_with_main_end; i < legacy_main_extensions_package_fallback_end; diff --git a/src/node_url.cc b/src/node_url.cc index 7677c281cdade9..94510aa1904a00 100644 --- a/src/node_url.cc +++ b/src/node_url.cc @@ -536,6 +536,19 @@ std::optional FileURLToPath(Environment* env, #endif // _WIN32 } +// Reverse the logic applied by path.toNamespacedPath() to create a +// namespace-prefixed path. +void FromNamespacedPath(std::string* path) { +#ifdef _WIN32 + if (path->compare(0, 8, "\\\\?\\UNC\\", 8) == 0) { + *path = path->substr(8); + path->insert(0, "\\\\"); + } else if (path->compare(0, 4, "\\\\?\\", 4) == 0) { + *path = path->substr(4); + } +#endif +} + } // namespace url } // namespace node diff --git a/src/node_url.h b/src/node_url.h index a0f595934a1265..c106e8245284da 100644 --- a/src/node_url.h +++ b/src/node_url.h @@ -85,6 +85,7 @@ class BindingData : public SnapshotableObject { std::string FromFilePath(std::string_view file_path); std::optional FileURLToPath(Environment* env, const ada::url_aggregator& file_url); +void FromNamespacedPath(std::string* path); } // namespace url