Skip to content
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

Jump to bottom

convert path to the native locale before passing to boost::interprocess::file_mapping() #838

Merged
merged 3 commits into from
Jun 5, 2018
Merged

convert path to the native locale before passing to boost::interprocess::file_mapping() #838

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b00cc65
use Rf_translateChar()
yutannihilation May 1, 2018
d5e259e
declare path as CharacterVector
yutannihilation May 10, 2018
3ec995e
add a NEWS item
yutannihilation May 10, 2018
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
1 change: 1 addition & 0 deletions NEWS.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,7 @@ you would pass `skip = 3`, now you only need to pass `skip = 2`.
in most cases (#730, @yutannihilation).
* `read_*()` no longer throws a "length of NULL cannot be changed" warning when
trying to resize a skipped column (#750, #833).
* `read_*()` now handles non-ASCII paths properly with R >=3.5.0 on Windows (#838, @yutannihilation).

# readr 1.1.1

Expand Down
4 changes: 2 additions & 2 deletions src/Source.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@ SourcePtr Source::create(List spec) {
return SourcePtr(
new SourceString(as<CharacterVector>(spec[0]), skip, comment));
} else if (subclass == "source_file") {
std::string path(as<CharacterVector>(spec[0])[0]);
return SourcePtr(new SourceFile(path, skip, comment));
CharacterVector path(spec[0]);
return SourcePtr(new SourceFile(Rf_translateChar(path[0]), skip, comment));
}

Rcpp::stop("Unknown source type");
Expand Down