strepsirrhini/libreoffice-online
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Just use "/" instead of Poco::Path::separator()

Browse source
This commit is contained in:
Tor Lillqvist 2016-04-18 15:33:22 +03:00
parent 311a748d45
commit a08b2a0e0b
3 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
loolwsd/LOOLForKit.cpp
View file

@ -268,7 +268,7 @@ int main(int argc, char** argv)
if (!std::getenv("LOK_VIEW_CALLBACK"))
Log::info("Note: LOK_VIEW_CALLBACK is not set.");
const Path pipePath = Path::forDirectory(childRoot + Path::separator() + FIFO_PATH);
const Path pipePath = Path::forDirectory(childRoot + "/" + FIFO_PATH);
const std::string pipeLoolwsd = Path(pipePath, FIFO_LOOLWSD).toString();
if ( (pipeFd = open(pipeLoolwsd.c_str(), O_RDONLY) ) < 0 )
{

2
loolwsd/LOOLKit.cpp
View file

@ -886,7 +886,7 @@ void lokit_main(const std::string& childRoot,
{
instdir_path = "/" + loSubPath + "/program";
jailPath = Path::forDirectory(childRoot + Path::separator() + jailId);
jailPath = Path::forDirectory(childRoot + "/" + jailId);
Log::info("Jail path: " + jailPath.toString());
File(jailPath).createDirectories();

12
loolwsd/LOOLWSD.cpp
View file

@ -239,7 +239,7 @@ public:
if (!params.has("filename"))
return;
Path tempPath = Path::forDirectory(TemporaryFile().tempName() + Path::separator());
Path tempPath = Path::forDirectory(TemporaryFile().tempName() + "/");
File(tempPath).createDirectories();
tempPath.setFileName(params.get("filename"));
_filename = tempPath.toString();
@ -428,7 +428,7 @@ private:
const std::string dirPath = LOOLWSD::ChildRoot + formChildid
+ JAILED_DOCUMENT_ROOT + "insertfile";
File(dirPath).createDirectories();
std::string fileName = dirPath + Path::separator() + form.get("name");
std::string fileName = dirPath + "/" + form.get("name");
File(tmpPath).moveTo(fileName);
return false;
}
@ -443,7 +443,7 @@ private:
+ JAILED_DOCUMENT_ROOT + tokens[2];
std::string fileName;
URI::decode(tokens[3], fileName);
const std::string filePath = dirPath + Path::separator() + fileName;
const std::string filePath = dirPath + "/" + fileName;
Log::info("HTTP request for: " + filePath);
File file(filePath);
if (file.exists())
@ -1383,8 +1383,8 @@ int LOOLWSD::main(const std::vector<std::string>& /*args*/)
if (ChildRoot.empty())
throw MissingOptionException("childroot");
else if (ChildRoot[ChildRoot.size() - 1] != Path::separator())
ChildRoot += Path::separator();
else if (ChildRoot[ChildRoot.size() - 1] != '/')
ChildRoot += '/';
if (FileServerRoot.empty())
FileServerRoot = Path(Application::instance().commandPath()).parent().parent().toString();
@ -1399,7 +1399,7 @@ int LOOLWSD::main(const std::vector<std::string>& /*args*/)
Log::warn("No admin credentials set via 'admincreds' command-line argument. Admin Console will be disabled.");
}
const Path pipePath = Path::forDirectory(ChildRoot + Path::separator() + FIFO_PATH);
const Path pipePath = Path::forDirectory(ChildRoot + "/" + FIFO_PATH);
if (!File(pipePath).exists() && !File(pipePath).createDirectory())
{
Log::error("Failed to create pipe directory [" + pipePath.toString() + "].");