oysteikt/mpd
oysteikt/mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

fs/StandardDirectory: pass const string to ParseConfigLine()

Browse Source
This commit is contained in:
Max Kellermann 2022-11-28 17:01:45 +01:00
parent 8fe29f5728
commit f6f3c4c25b
1 changed files with 13 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/fs/StandardDirectory.cxx
View File

@ -39,6 +39,7 @@
#endif #endif
#ifdef USE_XDG #ifdef USE_XDG
#include "util/StringSplit.hxx"
#include "util/StringStrip.hxx" #include "util/StringStrip.hxx"
#include "util/StringCompare.hxx" #include "util/StringCompare.hxx"
#include "fs/io/TextFile.hxx" #include "fs/io/TextFile.hxx"
@ -136,7 +137,8 @@ static AllocatedPath GetStandardDir(int folder_id)
static const char home_prefix[] = "$HOME/"; static const char home_prefix[] = "$HOME/";
static bool static bool
ParseConfigLine(char *line, const char *dir_name, AllocatedPath &result_dir) ParseConfigLine(const char *line, const char *dir_name,
AllocatedPath &result_dir)
{ {
// strip leading white space // strip leading white space
line = StripLeft(line); line = StripLeft(line);
@ -171,34 +173,31 @@ ParseConfigLine(char *line, const char *dir_name, AllocatedPath &result_dir)
home_relative = true; home_relative = true;
} }
char *line_end;
// find end of the string // find end of the string
std::string_view path_view;
if (quoted) { if (quoted) {
line_end = std::strrchr(line, '"'); const auto [pv, rest] = SplitLast(std::string_view{line}, '"');
if (line_end == nullptr) if (rest.data() == nullptr)
return true; return true;
path_view = pv;
} else { } else {
line_end = StripRight(line, line + strlen(line)); path_view = line;
path_view = StripRight(path_view);
} }
// check for empty result // check for empty result
if (line == line_end) if (path_view.empty())
return true; return true;
*line_end = 0;
// build the result path // build the result path
const auto path_fs = Path::FromFS(line); auto result = AllocatedPath::FromFS(path_view);
AllocatedPath result = nullptr;
if (home_relative) { if (home_relative) {
auto home = GetHomeDir(); auto home = GetHomeDir();
if (home.IsNull()) if (home.IsNull())
return true; return true;
result = home / path_fs; result = home / result;
} else {
result = AllocatedPath(path_fs);
} }
if (IsValidDir(result.c_str())) { if (IsValidDir(result.c_str())) {