mirror/nzbget
1
0
Fork 0
mirror of https://github.com/nzbget/nzbget.git synced 2026-04-25 23:36:54 -04:00
Code Issues Packages Projects Releases Wiki Activity

#136: avoid double slashes in paths

Browse Source 
Extra long path names are not normalized automatically by Windows and
therefore must contain paths in canonical form.
This commit is contained in:
Andrey Prygunkov
2016-01-23 14:23:53 +01:00
parent 26fea301e0
commit ff69fbbeb9
12 changed files with 60 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
daemon/queue/Scanner.cpp
View File

@@ -161,13 +161,11 @@ void Scanner::CheckIncomingNzbs(const char* directory, const char* category, boo
continue;
}
BString<1024> fullfilename("%s%s", directory, filename);
BString<1024> fullfilename("%s%c%s", directory, PATH_SEPARATOR, filename);
bool isDirectory = FileSystem::DirectoryExists(fullfilename);
// check subfolders
if (isDirectory)
{
fullfilename[strlen(fullfilename) + 1] = '\0';
fullfilename.AppendFmt("%c", PATH_SEPARATOR);
const char* useCategory = filename;
BString<1024> subCategory;
if (strlen(category) > 0)
@@ -509,7 +507,7 @@ Scanner::EAddStatus Scanner::AddExternalFile(const char* nzbName, const char* ca
int num = 1;
while (num == 1 || FileSystem::FileExists(tempFileName))
{
tempFileName.Format("%snzb-%i.tmp", g_Options->GetTempDir(), num);
tempFileName.Format("%s%cnzb-%i.tmp", g_Options->GetTempDir(), PATH_SEPARATOR, num);
num++;
}
@@ -535,7 +533,7 @@ Scanner::EAddStatus Scanner::AddExternalFile(const char* nzbName, const char* ca
validNzbName.Append(".nzb");
}
BString<1024> scanFileName("%s%s", g_Options->GetNzbDir(), *validNzbName);
BString<1024> scanFileName("%s%c%s", g_Options->GetNzbDir(), PATH_SEPARATOR, *validNzbName);
char *ext = strrchr(validNzbName, '.');
if (ext)
@@ -549,11 +547,13 @@ Scanner::EAddStatus Scanner::AddExternalFile(const char* nzbName, const char* ca
{
if (ext)
{
scanFileName.Format("%s%s_%i.%s", g_Options->GetNzbDir(), *validNzbName, num, ext);
scanFileName.Format("%s%c%s_%i.%s", g_Options->GetNzbDir(),
PATH_SEPARATOR, *validNzbName, num, ext);
}
else
{
scanFileName.Format("%s%s_%i", g_Options->GetNzbDir(), *validNzbName, num);
scanFileName.Format("%s%c%s_%i", g_Options->GetNzbDir(),
PATH_SEPARATOR, *validNzbName, num);
}
num++;
}