Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
M
mpd
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Иван Мажукин
mpd
Commits
774d26b9
Commit
774d26b9
authored
Feb 24, 2018
by
Max Kellermann
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
storage/nfs: assume UTF-8 when accessing NFS from Windows
Fixes two build failures with libnfs on Windows.
parent
f3e683bd
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
12 additions
and
0 deletions
+12
-0
NfsStorage.cxx
src/storage/plugins/NfsStorage.cxx
+12
-0
No files found.
src/storage/plugins/NfsStorage.cxx
View file @
774d26b9
...
...
@@ -219,7 +219,12 @@ UriToNfsPath(const char *_uri_utf8)
std
::
string
uri_utf8
(
"/"
);
uri_utf8
.
append
(
_uri_utf8
);
#ifdef _WIN32
/* assume UTF-8 when accessing NFS from Windows */
return
uri_utf8
;
#else
return
AllocatedPath
::
FromUTF8Throw
(
uri_utf8
.
c_str
()).
Steal
();
#endif
}
std
::
string
...
...
@@ -358,7 +363,14 @@ NfsListDirectoryOperation::CollectEntries(struct nfsdir *dir)
const
struct
nfsdirent
*
ent
;
while
((
ent
=
connection
.
ReadDirectory
(
dir
))
!=
nullptr
)
{
#ifdef _WIN32
/* assume UTF-8 when accessing NFS from Windows */
const
auto
name_fs
=
AllocatedPath
::
FromUTF8Throw
(
ent
->
name
);
if
(
name_fs
.
IsNull
())
continue
;
#else
const
Path
name_fs
=
Path
::
FromFS
(
ent
->
name
);
#endif
if
(
SkipNameFS
(
name_fs
.
c_str
()))
continue
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment