-
Notifications
You must be signed in to change notification settings - Fork 1.9k
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.
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
Fix pathing issues on Windows #49
Merged
Merged
Changes from all commits
Commits
Show all changes
5 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,74 +1,70 @@ | ||
| /* | ||
| * Copyright (C) 2018 The Android Open Source Project | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
|
|
||
| #include <utils/Path.h> | ||
|
|
||
| #include <direct.h> | ||
| #include <Strsafe.h> | ||
| #include <sys/stat.h> | ||
| #include <stdlib.h> | ||
| #include <windows.h> | ||
| #include <shlwapi.h> | ||
|
|
||
| namespace utils { | ||
|
|
||
| bool Path::mkdir() const { | ||
| return _mkdir(m_path.c_str()) == 0; | ||
| } | ||
|
|
||
| Path Path::getCurrentExecutable() { | ||
| // First, need to establish resource path. | ||
| TCHAR path[MAX_PATH + 1]; | ||
| Path result; | ||
|
|
||
| GetModuleFileName(NULL, path, MAX_PATH + 1); | ||
| result.setPath(path); | ||
|
|
||
| return result; | ||
| } | ||
|
|
||
| std::vector<Path> Path::listContents() const { | ||
| // Return an empty vector if the path doesn't exist or is not a directory | ||
| if (!isDirectory() || !exists()) { | ||
| return {}; | ||
| } | ||
|
|
||
| TCHAR dirName[MAX_PATH]; | ||
| StringCchCopy(dirName, MAX_PATH, c_str()); | ||
|
|
||
| WIN32_FIND_DATA findData; | ||
| HANDLE find = FindFirstFile(dirName, &findData); | ||
|
|
||
| std::vector<Path> directory_contents; | ||
| do | ||
| { | ||
| if (findData.cFileName[0] != '.') { | ||
| directory_contents.push_back(concat(findData.cFileName)); | ||
| } | ||
| } while (FindNextFile(find, &findData) != 0); | ||
|
|
||
| return directory_contents; | ||
| } | ||
|
|
||
| std::string Path::getCanonicalPath(const std::string& path) { | ||
| if (path.empty()) return ""; | ||
|
|
||
| char canonized[MAX_PATH]; | ||
| PathCanonicalize(canonized, path.c_str()); | ||
| return canonized; | ||
| } | ||
|
|
||
| } // namespace utils | ||
| /* | ||
| * Copyright (C) 2018 The Android Open Source Project | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
|
|
||
| #include <utils/Path.h> | ||
|
|
||
| #include <direct.h> | ||
| #include <Strsafe.h> | ||
| #include <sys/stat.h> | ||
| #include <stdlib.h> | ||
| #include <windows.h> | ||
| #include <shlwapi.h> | ||
|
|
||
| namespace utils { | ||
|
|
||
| bool Path::mkdir() const { | ||
| return _mkdir(m_path.c_str()) == 0; | ||
| } | ||
|
|
||
| Path Path::getCurrentExecutable() { | ||
| // First, need to establish resource path. | ||
| TCHAR path[MAX_PATH + 1]; | ||
| Path result; | ||
|
|
||
| GetModuleFileName(NULL, path, MAX_PATH + 1); | ||
| result.setPath(path); | ||
|
|
||
| return result; | ||
| } | ||
|
|
||
| std::vector<Path> Path::listContents() const { | ||
| // Return an empty vector if the path doesn't exist or is not a directory | ||
| if (!isDirectory() || !exists()) { | ||
| return {}; | ||
| } | ||
|
|
||
| TCHAR dirName[MAX_PATH]; | ||
| StringCchCopy(dirName, MAX_PATH, c_str()); | ||
|
|
||
| WIN32_FIND_DATA findData; | ||
| HANDLE find = FindFirstFile(dirName, &findData); | ||
|
|
||
| std::vector<Path> directory_contents; | ||
| do | ||
| { | ||
| if (findData.cFileName[0] != '.') { | ||
| directory_contents.push_back(concat(findData.cFileName)); | ||
| } | ||
| } while (FindNextFile(find, &findData) != 0); | ||
|
|
||
| return directory_contents; | ||
| } | ||
|
|
||
| bool Path::isAbsolute() const { | ||
| return !PathIsRelative(m_path.c_str()); | ||
| } | ||
|
|
||
| } // namespace utils | ||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Changed line endings to UNIX style, hence the massive diff. New function at the very bottom:
Path::isAbsolute