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

Listen: Allow tilde paths for socket.

Browse Source
This commit is contained in:
Maarten de Vries
2013-08-25 15:51:41 +02:00
committed by Max Kellermann
parent cf98b0e261
commit 08e6d222a2
5 changed files with 23 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/ConfigGlobal.cxx
View File

@@ -105,6 +105,12 @@ config_get_path(ConfigOption option, Error &error)
if (param == nullptr)
return Path::Null();
return config_parse_path(param, error);
}
Path
config_parse_path(const struct config_param *param, Error & error)
{
Path path = ParsePath(param->value, error);
if (gcc_unlikely(path.IsNull()))
error.FormatPrefix("Invalid path at line %i: ",

8
src/ConfigGlobal.hxx
View File

@@ -72,6 +72,14 @@ config_get_string(enum ConfigOption option, const char *default_value);
Path
config_get_path(enum ConfigOption option, Error &error);
/**
* Parse a configuration parameter as a path.
* If there is a tilde prefix, it is expanded. If the path could
* not be parsed, returns Path::Null() and sets the error.
*/
Path
config_parse_path(const struct config_param *param, Error & error_r);
gcc_pure
unsigned
config_get_unsigned(enum ConfigOption option, unsigned default_value);

6
src/Listen.cxx
View File

@@ -27,6 +27,7 @@
#include "ConfigOption.hxx"
#include "event/ServerSocket.hxx"
#include "util/Error.hxx"
#include "fs/Path.hxx"
#include <string.h>
#include <assert.h>
@@ -64,8 +65,9 @@ listen_add_config_param(unsigned int port,
if (0 == strcmp(param->value, "any")) {
return listen_socket->AddPort(port, error_r);
} else if (param->value[0] == '/') {
return listen_socket->AddPath(param->value, error_r);
} else if (param->value[0] == '/' || param->value[0] == '~') {
Path path = config_parse_path(param, error_r);
return !path.IsNull() && listen_socket->AddPath(path.c_str(), error_r);
} else {
return listen_socket->AddHost(param->value, port, error_r);
}