pegasus/weechat
1
0
Fork 0
mirror of https://github.com/weechat/weechat.git synced 2026-07-09 03:03:12 +02:00
Code Activity

core: split WeeChat home in 4 directories, use XDG directories by default (issue #1285)

Browse Source 
The 4 directories (which can be the same):

- config: configuration files, certificates
- data: log/upgrade files, local plugins, scripts, xfer files
- cache: script repository, scripts downloaded (temporary location)
- runtime: FIFO pipe, relay UNIX sockets
This commit is contained in:
Sébastien Helleu
2021-05-02 11:56:25 +02:00
parent 4c5fcb743b
commit 0f9640a5f3
38 changed files with 1129 additions and 363 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/plugins/relay/relay-network.c
+11 -1
View File
@@ -49,15 +49,25 @@ relay_network_set_ssl_cert_key (int verbose)
{
char *certkey_path;
int ret;
struct t_hashtable *options;
gnutls_certificate_free_credentials (relay_gnutls_x509_cred);
gnutls_certificate_allocate_credentials (&relay_gnutls_x509_cred);
relay_network_init_ssl_cert_key_ok = 0;
options = weechat_hashtable_new (
32,
WEECHAT_HASHTABLE_STRING,
WEECHAT_HASHTABLE_STRING,
NULL, NULL);
if (options)
weechat_hashtable_set (options, "directory", "config");
certkey_path = weechat_string_eval_path_home (
weechat_config_string (relay_config_network_ssl_cert_key),
NULL, NULL, NULL);
NULL, NULL, options);
if (options)
weechat_hashtable_free (options);
if (certkey_path)
{
ret = gnutls_certificate_set_x509_key_file (relay_gnutls_x509_cred,
src/plugins/relay/relay-server.c
+22 -2
View File
@@ -791,6 +791,7 @@ relay_server_new (const char *protocol_string, enum t_relay_protocol protocol,
int ipv4, int ipv6, int ssl, int unix_socket)
{
struct t_relay_server *new_server, *dup_server;
struct t_hashtable *options;
if (!protocol_string)
return NULL;
@@ -823,8 +824,17 @@ relay_server_new (const char *protocol_string, enum t_relay_protocol protocol,
new_server->protocol_args =
(protocol_args) ? strdup (protocol_args) : NULL;
new_server->port = port;
options = weechat_hashtable_new (
32,
WEECHAT_HASHTABLE_STRING,
WEECHAT_HASHTABLE_STRING,
NULL, NULL);
if (options)
weechat_hashtable_set (options, "directory", "runtime");
new_server->path = weechat_string_eval_path_home (path,
NULL, NULL, NULL);
NULL, NULL, options);
if (options)
weechat_hashtable_free (options);
new_server->ipv4 = ipv4;
new_server->ipv6 = ipv6;
new_server->ssl = ssl;
@@ -862,8 +872,18 @@ void
relay_server_update_path (struct t_relay_server *server, const char *path)
{
char *new_path;
struct t_hashtable *options;
new_path = weechat_string_eval_path_home (path, NULL, NULL, NULL);
options = weechat_hashtable_new (
32,
WEECHAT_HASHTABLE_STRING,
WEECHAT_HASHTABLE_STRING,
NULL, NULL);
if (options)
weechat_hashtable_set (options, "directory", "runtime");
new_path = weechat_string_eval_path_home (path, NULL, NULL, options);
if (options)
weechat_hashtable_free (options);
if (!new_path)
return;