Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-19 00:05:36 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1438866 - Use proper path separators for windows. r=emilio

Browse Source 
The indexer has paths handed to it on Windows with the backslash path separator.
However it currently hard-codes the forward-slash Unix/macOS path separator,
so we need to generify that code appropriately.

MozReview-Commit-ID: Iy8bImt2BXW

--HG--
extra : rebase_source : 4b88b44319c05ce816afc4e690d3d33d39b7e43c
This commit is contained in:
Kartikaya Gupta 2018-02-16 17:07:39 -05:00
parent eb8e51bd1d
commit 31c634d913
3 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
build/clang-plugin/mozsearch-plugin/FileOperations.cpp
View File

@ -27,11 +27,11 @@
// the path.
void ensurePath(std::string Path) {
size_t Pos = 0;
if (Path[0] == '/') {
if (Path[0] == PATHSEP_CHAR) {
Pos++;
}
while ((Pos = Path.find('/', Pos)) != std::string::npos) {
while ((Pos = Path.find(PATHSEP_CHAR, Pos)) != std::string::npos) {
std::string Portion = Path.substr(0, Pos);
if (!Portion.empty()) {
#if defined(_WIN32) || defined(_WIN64)

5
build/clang-plugin/mozsearch-plugin/FileOperations.h
View File

@ -11,6 +11,11 @@
#if defined(_WIN32) || defined(_WIN64)
#include <windows.h>
#define PATHSEP_CHAR '\\'
#define PATHSEP_STRING "\\"
#else
#define PATHSEP_CHAR '/'
#define PATHSEP_STRING "/"
#endif
// Make sure that all directories on path exist, excluding the final element of

8
build/clang-plugin/mozsearch-plugin/MozsearchIndexer.cpp
View File

@ -36,7 +36,7 @@
using namespace clang;
const std::string GENERATED("__GENERATED__/");
const std::string GENERATED("__GENERATED__" PATHSEP_STRING);
// Absolute path to directory containing source code.
std::string Srcdir;
@ -1484,9 +1484,9 @@ protected:
return false;
}
ensurePath(Args[1] + "/");
ensurePath(Args[1] + PATHSEP_STRING);
Outdir = getAbsolutePath(Args[1]);
Outdir += "/";
Outdir += PATHSEP_STRING;
Objdir = getAbsolutePath(Args[2]);
if (Objdir.empty()) {
@ -1496,7 +1496,7 @@ protected:
D.Report(DiagID) << Args[2];
return false;
}
Objdir += "/";
Objdir += PATHSEP_STRING;
printf("MOZSEARCH: %s %s %s\n", Srcdir.c_str(), Outdir.c_str(),
Objdir.c_str());