|
Lines 3435-3441
Link Here
|
| 3435 |
errorMsg = msg.str(); |
3435 |
errorMsg = msg.str(); |
| 3436 |
return false; |
3436 |
return false; |
| 3437 |
} |
3437 |
} |
| 3438 |
pathOut = self; |
3438 |
pathOut = SystemTools::GetRealPath(self, &errorMsg); |
| 3439 |
return true; |
3439 |
return true; |
| 3440 |
} |
3440 |
} |
| 3441 |
|
3441 |
|
|
Lines 3538-3544
Link Here
|
| 3538 |
|
3538 |
|
| 3539 |
// Split the input path components. |
3539 |
// Split the input path components. |
| 3540 |
std::vector<std::string> path_components; |
3540 |
std::vector<std::string> path_components; |
| 3541 |
SystemTools::SplitPath(in_path, path_components); |
3541 |
SystemTools::SplitPath(SystemTools::GetRealPath(in_path, nullptr), path_components); |
| 3542 |
out_components.reserve(path_components.size()); |
3542 |
out_components.reserve(path_components.size()); |
| 3543 |
|
3543 |
|
| 3544 |
// If the input path is relative, start with a base path. |
3544 |
// If the input path is relative, start with a base path. |
|
Lines 3547-3557
Link Here
|
| 3547 |
|
3547 |
|
| 3548 |
if (in_base) { |
3548 |
if (in_base) { |
| 3549 |
// Use the given base path. |
3549 |
// Use the given base path. |
| 3550 |
SystemTools::SplitPath(*in_base, base_components); |
3550 |
SystemTools::SplitPath(SystemTools::GetRealPath(*in_base, nullptr), base_components); |
| 3551 |
} else { |
3551 |
} else { |
| 3552 |
// Use the current working directory as a base path. |
3552 |
// Use the current working directory as a base path. |
| 3553 |
std::string cwd = SystemTools::GetCurrentWorkingDirectory(); |
3553 |
std::string cwd = SystemTools::GetCurrentWorkingDirectory(); |
| 3554 |
SystemTools::SplitPath(cwd, base_components); |
3554 |
SystemTools::SplitPath(SystemTools::GetRealPath(cwd, nullptr), base_components); |
| 3555 |
} |
3555 |
} |
| 3556 |
|
3556 |
|
| 3557 |
// Append base path components to the output path. |
3557 |
// Append base path components to the output path. |
|
Lines 3589-3595
Link Here
|
| 3589 |
SystemTools::ConvertToUnixSlashes(newPath); |
3589 |
SystemTools::ConvertToUnixSlashes(newPath); |
| 3590 |
#endif |
3590 |
#endif |
| 3591 |
// Return the reconstructed path. |
3591 |
// Return the reconstructed path. |
| 3592 |
return newPath; |
3592 |
return SystemTools::GetRealPath(newPath, nullptr); |
| 3593 |
} |
3593 |
} |
| 3594 |
} |
3594 |
} |
| 3595 |
|
3595 |
|
