fs/AllocatedPath: make the nullptr_t constructor public

This commit is contained in:
Max Kellermann
2018-01-17 12:17:41 +01:00
parent c4f7740b80
commit bbc5212436
24 changed files with 58 additions and 62 deletions

View File

@@ -45,15 +45,15 @@ ReadLink(Path path)
#ifdef _WIN32
(void)path;
errno = EINVAL;
return AllocatedPath::Null();
return nullptr;
#else
char buffer[MPD_PATH_MAX];
ssize_t size = readlink(path.c_str(), buffer, MPD_PATH_MAX);
if (size < 0)
return AllocatedPath::Null();
return nullptr;
if (size_t(size) >= MPD_PATH_MAX) {
errno = ENOMEM;
return AllocatedPath::Null();
return nullptr;
}
buffer[size] = '\0';
return AllocatedPath::FromFS(buffer);