annotate mcabber/mcabber/settings.c @ 2340:6eeef7be58f3

Do also free pgp/otr settings
author franky
date Sun, 19 May 2019 09:45:53 +0200
parents 7f11a567d236
children c78988260b9f
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
279
f5dd437c057b Rewrite the settings system
Mikael Berthe <mikael@lilotux.net>
parents:
diff changeset
1 /*
f5dd437c057b Rewrite the settings system
Mikael Berthe <mikael@lilotux.net>
parents:
diff changeset
2 * settings.c -- Configuration stuff
393
f8f3c7493457 Whitespace cleanup
Mikael Berthe <mikael@lilotux.net>
parents: 378
diff changeset
3 *
2204
ccd4ffa41a1b Use XDG configuration directory if a config file exists
Mikael Berthe <mikael@lilotux.net>
parents: 2164
diff changeset
4 * Copyright (C) 2005-2015 Mikael Berthe <mikael@lilotux.net>
279
f5dd437c057b Rewrite the settings system
Mikael Berthe <mikael@lilotux.net>
parents:
diff changeset
5 *
f5dd437c057b Rewrite the settings system
Mikael Berthe <mikael@lilotux.net>
parents:
diff changeset
6 * This program is free software; you can redistribute it and/or modify
f5dd437c057b Rewrite the settings system
Mikael Berthe <mikael@lilotux.net>
parents:
diff changeset
7 * it under the terms of the GNU General Public License as published by
f5dd437c057b Rewrite the settings system
Mikael Berthe <mikael@lilotux.net>
parents:
diff changeset
8 * the Free Software Foundation; either version 2 of the License, or (at
f5dd437c057b Rewrite the settings system
Mikael Berthe <mikael@lilotux.net>
parents:
diff changeset
9 * your option) any later version.
f5dd437c057b Rewrite the settings system
Mikael Berthe <mikael@lilotux.net>
parents:
diff changeset
10 *
f5dd437c057b Rewrite the settings system
Mikael Berthe <mikael@lilotux.net>
parents:
diff changeset
11 * This program is distributed in the hope that it will be useful, but
f5dd437c057b Rewrite the settings system
Mikael Berthe <mikael@lilotux.net>
parents:
diff changeset
12 * WITHOUT ANY WARRANTY; without even the implied warranty of
f5dd437c057b Rewrite the settings system
Mikael Berthe <mikael@lilotux.net>
parents:
diff changeset
13 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
f5dd437c057b Rewrite the settings system
Mikael Berthe <mikael@lilotux.net>
parents:
diff changeset
14 * General Public License for more details.
f5dd437c057b Rewrite the settings system
Mikael Berthe <mikael@lilotux.net>
parents:
diff changeset
15 *
f5dd437c057b Rewrite the settings system
Mikael Berthe <mikael@lilotux.net>
parents:
diff changeset
16 * You should have received a copy of the GNU General Public License
2268
f5402d705f67 Fix FSF addresses in all files
Mikael Berthe <mikael@lilotux.net>
parents: 2253
diff changeset
17 * along with this program; if not, see <http://www.gnu.org/licenses/>.
279
f5dd437c057b Rewrite the settings system
Mikael Berthe <mikael@lilotux.net>
parents:
diff changeset
18 */
f5dd437c057b Rewrite the settings system
Mikael Berthe <mikael@lilotux.net>
parents:
diff changeset
19
1598
a087125d8fc8 Replace libjabber with loudmouth
franky
parents: 1565
diff changeset
20 #include <stdio.h>
279
f5dd437c057b Rewrite the settings system
Mikael Berthe <mikael@lilotux.net>
parents:
diff changeset
21 #include <stdlib.h>
1598
a087125d8fc8 Replace libjabber with loudmouth
franky
parents: 1565
diff changeset
22 #include <string.h>
2204
ccd4ffa41a1b Use XDG configuration directory if a config file exists
Mikael Berthe <mikael@lilotux.net>
parents: 2164
diff changeset
23 #include <sys/stat.h>
279
f5dd437c057b Rewrite the settings system
Mikael Berthe <mikael@lilotux.net>
parents:
diff changeset
24
1607
14690e624e9d Add modules
Myhailo Danylenko <isbear@ukrpost.net>
parents: 1599
diff changeset
25 #include "config.h"
279
f5dd437c057b Rewrite the settings system
Mikael Berthe <mikael@lilotux.net>
parents:
diff changeset
26 #include "settings.h"
341
dea407d53fe6 Improve configuration file reading
Mikael Berthe <mikael@lilotux.net>
parents: 337
diff changeset
27 #include "commands.h"
378
2e6c7b1440d1 Improve debugging/logging
Mikael Berthe <mikael@lilotux.net>
parents: 374
diff changeset
28 #include "logprint.h"
1299
3b338a5c01fc OTR support
Frank Zschockelt <mcabber_otr[at]freakysoft.de>
parents: 1278
diff changeset
29 #include "otr.h"
1598
a087125d8fc8 Replace libjabber with loudmouth
franky
parents: 1565
diff changeset
30 #include "utils.h"
a087125d8fc8 Replace libjabber with loudmouth
franky
parents: 1565
diff changeset
31 #include "xmpp.h"
1653
fca9a4c17432 Improve UI latency and CPU usage
Myhailo Danylenko <isbear@ukrpost.net>
parents: 1611
diff changeset
32 #include "main.h"
279
f5dd437c057b Rewrite the settings system
Mikael Berthe <mikael@lilotux.net>
parents:
diff changeset
33
1299
3b338a5c01fc OTR support
Frank Zschockelt <mcabber_otr[at]freakysoft.de>
parents: 1278
diff changeset
34 // Maximum line length
1278
c3107650d165 Allow longer lines in config file
Mikael Berthe <mikael@lilotux.net>
parents: 1272
diff changeset
35 // (probably best to use the same value as INPUTLINE_LENGTH)
c3107650d165 Allow longer lines in config file
Mikael Berthe <mikael@lilotux.net>
parents: 1272
diff changeset
36 #define CONFLINE_LENGTH 1024
c3107650d165 Allow longer lines in config file
Mikael Berthe <mikael@lilotux.net>
parents: 1272
diff changeset
37
1070
9eaacc0ad3a2 Use a hash for settings
Mikael Berthe <mikael@lilotux.net>
parents: 1068
diff changeset
38 static GHashTable *option;
9eaacc0ad3a2 Use a hash for settings
Mikael Berthe <mikael@lilotux.net>
parents: 1068
diff changeset
39 static GHashTable *alias;
9eaacc0ad3a2 Use a hash for settings
Mikael Berthe <mikael@lilotux.net>
parents: 1068
diff changeset
40 static GHashTable *binding;
1673
552da310b83e Add option guards
Myhailo Danylenko <isbear@ukrpost.net>
parents: 1668
diff changeset
41 static GHashTable *guards;
279
f5dd437c057b Rewrite the settings system
Mikael Berthe <mikael@lilotux.net>
parents:
diff changeset
42
1065
230dca34dbea Extand pgp_data structure
Mikael Berthe <mikael@lilotux.net>
parents: 1004
diff changeset
43 #ifdef HAVE_GPGME /* PGP settings */
230dca34dbea Extand pgp_data structure
Mikael Berthe <mikael@lilotux.net>
parents: 1004
diff changeset
44 static GHashTable *pgpopt;
230dca34dbea Extand pgp_data structure
Mikael Berthe <mikael@lilotux.net>
parents: 1004
diff changeset
45
230dca34dbea Extand pgp_data structure
Mikael Berthe <mikael@lilotux.net>
parents: 1004
diff changeset
46 typedef struct {
230dca34dbea Extand pgp_data structure
Mikael Berthe <mikael@lilotux.net>
parents: 1004
diff changeset
47 gchar *pgp_keyid; /* KeyId the contact is supposed to use */
230dca34dbea Extand pgp_data structure
Mikael Berthe <mikael@lilotux.net>
parents: 1004
diff changeset
48 guint pgp_disabled; /* If TRUE, PGP is disabled for outgoing messages */
1197
6f602d3270a4 Add /pgp [-]force
Mikael Berthe <mikael@lilotux.net>
parents: 1192
diff changeset
49 guint pgp_force; /* If TRUE, PGP is used w/o negotiation */
2337
ffd0e57e9563 Defined types shall end with "_t"
franky
parents: 2268
diff changeset
50 } pgpopt_t;
2340
6eeef7be58f3 Do also free pgp/otr settings
franky
parents: 2339
diff changeset
51
6eeef7be58f3 Do also free pgp/otr settings
franky
parents: 2339
diff changeset
52 void pgpopt_free(gpointer data)
6eeef7be58f3 Do also free pgp/otr settings
franky
parents: 2339
diff changeset
53 {
6eeef7be58f3 Do also free pgp/otr settings
franky
parents: 2339
diff changeset
54 pgpopt_t *opt = (pgpopt_t *)data;
6eeef7be58f3 Do also free pgp/otr settings
franky
parents: 2339
diff changeset
55 g_free(opt->pgp_keyid);
6eeef7be58f3 Do also free pgp/otr settings
franky
parents: 2339
diff changeset
56 g_free(opt);
6eeef7be58f3 Do also free pgp/otr settings
franky
parents: 2339
diff changeset
57 }
1065
230dca34dbea Extand pgp_data structure
Mikael Berthe <mikael@lilotux.net>
parents: 1004
diff changeset
58 #endif
230dca34dbea Extand pgp_data structure
Mikael Berthe <mikael@lilotux.net>
parents: 1004
diff changeset
59
1768
d80a9e32ab1a Refuse to replace existing guards
Myhailo Danylenko <isbear@ukrpost.net>
parents: 1736
diff changeset
60 typedef struct {
d80a9e32ab1a Refuse to replace existing guards
Myhailo Danylenko <isbear@ukrpost.net>
parents: 1736
diff changeset
61 settings_guard_t guard;
d80a9e32ab1a Refuse to replace existing guards
Myhailo Danylenko <isbear@ukrpost.net>
parents: 1736
diff changeset
62 } installed_guard_t;
d80a9e32ab1a Refuse to replace existing guards
Myhailo Danylenko <isbear@ukrpost.net>
parents: 1736
diff changeset
63
1299
3b338a5c01fc OTR support
Frank Zschockelt <mcabber_otr[at]freakysoft.de>
parents: 1278
diff changeset
64 #ifdef HAVE_LIBOTR
3b338a5c01fc OTR support
Frank Zschockelt <mcabber_otr[at]freakysoft.de>
parents: 1278
diff changeset
65 static GHashTable *otrpolicy;
3b338a5c01fc OTR support
Frank Zschockelt <mcabber_otr[at]freakysoft.de>
parents: 1278
diff changeset
66 static enum otr_policy default_policy;
3b338a5c01fc OTR support
Frank Zschockelt <mcabber_otr[at]freakysoft.de>
parents: 1278
diff changeset
67 #endif
3b338a5c01fc OTR support
Frank Zschockelt <mcabber_otr[at]freakysoft.de>
parents: 1278
diff changeset
68
1070
9eaacc0ad3a2 Use a hash for settings
Mikael Berthe <mikael@lilotux.net>
parents: 1068
diff changeset
69 static inline GHashTable *get_hash(guint type)
279
f5dd437c057b Rewrite the settings system
Mikael Berthe <mikael@lilotux.net>
parents:
diff changeset
70 {
1070
9eaacc0ad3a2 Use a hash for settings
Mikael Berthe <mikael@lilotux.net>
parents: 1068
diff changeset
71 if (type == SETTINGS_TYPE_OPTION) return option;
9eaacc0ad3a2 Use a hash for settings
Mikael Berthe <mikael@lilotux.net>
parents: 1068
diff changeset
72 else if (type == SETTINGS_TYPE_ALIAS) return alias;
9eaacc0ad3a2 Use a hash for settings
Mikael Berthe <mikael@lilotux.net>
parents: 1068
diff changeset
73 else if (type == SETTINGS_TYPE_BINDING) return binding;
1299
3b338a5c01fc OTR support
Frank Zschockelt <mcabber_otr[at]freakysoft.de>
parents: 1278
diff changeset
74 #ifdef HAVE_LIBOTR
3b338a5c01fc OTR support
Frank Zschockelt <mcabber_otr[at]freakysoft.de>
parents: 1278
diff changeset
75 else if (type == SETTINGS_TYPE_OTR) return otrpolicy;
3b338a5c01fc OTR support
Frank Zschockelt <mcabber_otr[at]freakysoft.de>
parents: 1278
diff changeset
76 #endif
279
f5dd437c057b Rewrite the settings system
Mikael Berthe <mikael@lilotux.net>
parents:
diff changeset
77 return NULL;
f5dd437c057b Rewrite the settings system
Mikael Berthe <mikael@lilotux.net>
parents:
diff changeset
78 }
f5dd437c057b Rewrite the settings system
Mikael Berthe <mikael@lilotux.net>
parents:
diff changeset
79
f5dd437c057b Rewrite the settings system
Mikael Berthe <mikael@lilotux.net>
parents:
diff changeset
80 /* -- */
f5dd437c057b Rewrite the settings system
Mikael Berthe <mikael@lilotux.net>
parents:
diff changeset
81
1065
230dca34dbea Extand pgp_data structure
Mikael Berthe <mikael@lilotux.net>
parents: 1004
diff changeset
82 void settings_init(void)
230dca34dbea Extand pgp_data structure
Mikael Berthe <mikael@lilotux.net>
parents: 1004
diff changeset
83 {
1070
9eaacc0ad3a2 Use a hash for settings
Mikael Berthe <mikael@lilotux.net>
parents: 1068
diff changeset
84 option = g_hash_table_new_full(&g_str_hash, &g_str_equal, &g_free, &g_free);
9eaacc0ad3a2 Use a hash for settings
Mikael Berthe <mikael@lilotux.net>
parents: 1068
diff changeset
85 alias = g_hash_table_new_full(&g_str_hash, &g_str_equal, &g_free, &g_free);
9eaacc0ad3a2 Use a hash for settings
Mikael Berthe <mikael@lilotux.net>
parents: 1068
diff changeset
86 binding = g_hash_table_new_full(&g_str_hash, &g_str_equal, &g_free, &g_free);
1768
d80a9e32ab1a Refuse to replace existing guards
Myhailo Danylenko <isbear@ukrpost.net>
parents: 1736
diff changeset
87 guards = g_hash_table_new_full(&g_str_hash, &g_str_equal, &g_free, &g_free);
1065
230dca34dbea Extand pgp_data structure
Mikael Berthe <mikael@lilotux.net>
parents: 1004
diff changeset
88 #ifdef HAVE_GPGME
2340
6eeef7be58f3 Do also free pgp/otr settings
franky
parents: 2339
diff changeset
89 pgpopt = g_hash_table_new_full(&g_str_hash, &g_str_equal, &g_free, &pgpopt_free);
1065
230dca34dbea Extand pgp_data structure
Mikael Berthe <mikael@lilotux.net>
parents: 1004
diff changeset
90 #endif
1299
3b338a5c01fc OTR support
Frank Zschockelt <mcabber_otr[at]freakysoft.de>
parents: 1278
diff changeset
91 #ifdef HAVE_LIBOTR
2340
6eeef7be58f3 Do also free pgp/otr settings
franky
parents: 2339
diff changeset
92 otrpolicy = g_hash_table_new_full(&g_str_hash, &g_str_equal, &g_free, &g_free);
1299
3b338a5c01fc OTR support
Frank Zschockelt <mcabber_otr[at]freakysoft.de>
parents: 1278
diff changeset
93 #endif
1065
230dca34dbea Extand pgp_data structure
Mikael Berthe <mikael@lilotux.net>
parents: 1004
diff changeset
94 }
230dca34dbea Extand pgp_data structure
Mikael Berthe <mikael@lilotux.net>
parents: 1004
diff changeset
95
2339
7f11a567d236 Implemented settings_free()
franky
parents: 2337
diff changeset
96 void settings_free(void)
7f11a567d236 Implemented settings_free()
franky
parents: 2337
diff changeset
97 {
7f11a567d236 Implemented settings_free()
franky
parents: 2337
diff changeset
98 g_hash_table_destroy(option);
7f11a567d236 Implemented settings_free()
franky
parents: 2337
diff changeset
99 g_hash_table_destroy(alias);
7f11a567d236 Implemented settings_free()
franky
parents: 2337
diff changeset
100 g_hash_table_destroy(binding);
7f11a567d236 Implemented settings_free()
franky
parents: 2337
diff changeset
101 g_hash_table_destroy(guards);
7f11a567d236 Implemented settings_free()
franky
parents: 2337
diff changeset
102 #ifdef HAVE_GPGME
7f11a567d236 Implemented settings_free()
franky
parents: 2337
diff changeset
103 g_hash_table_destroy(pgpopt);
7f11a567d236 Implemented settings_free()
franky
parents: 2337
diff changeset
104 #endif
7f11a567d236 Implemented settings_free()
franky
parents: 2337
diff changeset
105 #ifdef HAVE_LIBOTR
7f11a567d236 Implemented settings_free()
franky
parents: 2337
diff changeset
106 g_hash_table_destroy(otrpolicy);
7f11a567d236 Implemented settings_free()
franky
parents: 2337
diff changeset
107 #endif
7f11a567d236 Implemented settings_free()
franky
parents: 2337
diff changeset
108 }
7f11a567d236 Implemented settings_free()
franky
parents: 2337
diff changeset
109
2204
ccd4ffa41a1b Use XDG configuration directory if a config file exists
Mikael Berthe <mikael@lilotux.net>
parents: 2164
diff changeset
110 // settings_get_mcabber_config_dir()
ccd4ffa41a1b Use XDG configuration directory if a config file exists
Mikael Berthe <mikael@lilotux.net>
parents: 2164
diff changeset
111 // Returns the mcabber configuration directory.
ccd4ffa41a1b Use XDG configuration directory if a config file exists
Mikael Berthe <mikael@lilotux.net>
parents: 2164
diff changeset
112 // The directory is looked up for only once (and the string is never freed,
ccd4ffa41a1b Use XDG configuration directory if a config file exists
Mikael Berthe <mikael@lilotux.net>
parents: 2164
diff changeset
113 // but we might change this later).
ccd4ffa41a1b Use XDG configuration directory if a config file exists
Mikael Berthe <mikael@lilotux.net>
parents: 2164
diff changeset
114 const gchar *settings_get_mcabber_config_dir(void)
ccd4ffa41a1b Use XDG configuration directory if a config file exists
Mikael Berthe <mikael@lilotux.net>
parents: 2164
diff changeset
115 {
ccd4ffa41a1b Use XDG configuration directory if a config file exists
Mikael Berthe <mikael@lilotux.net>
parents: 2164
diff changeset
116 static char *config_dir;
2253
5a107c907e71 Read $HOME/.mcabberrc if there is no mcabber configuration directory
Mikael Berthe <mikael@lilotux.net>
parents: 2204
diff changeset
117 const char *home_dir;
2204
ccd4ffa41a1b Use XDG configuration directory if a config file exists
Mikael Berthe <mikael@lilotux.net>
parents: 2164
diff changeset
118 GString *sfilename;
ccd4ffa41a1b Use XDG configuration directory if a config file exists
Mikael Berthe <mikael@lilotux.net>
parents: 2164
diff changeset
119 FILE *fp;
ccd4ffa41a1b Use XDG configuration directory if a config file exists
Mikael Berthe <mikael@lilotux.net>
parents: 2164
diff changeset
120
ccd4ffa41a1b Use XDG configuration directory if a config file exists
Mikael Berthe <mikael@lilotux.net>
parents: 2164
diff changeset
121 if (config_dir)
ccd4ffa41a1b Use XDG configuration directory if a config file exists
Mikael Berthe <mikael@lilotux.net>
parents: 2164
diff changeset
122 return config_dir;
ccd4ffa41a1b Use XDG configuration directory if a config file exists
Mikael Berthe <mikael@lilotux.net>
parents: 2164
diff changeset
123
ccd4ffa41a1b Use XDG configuration directory if a config file exists
Mikael Berthe <mikael@lilotux.net>
parents: 2164
diff changeset
124 home_dir = getenv("HOME");
ccd4ffa41a1b Use XDG configuration directory if a config file exists
Mikael Berthe <mikael@lilotux.net>
parents: 2164
diff changeset
125 if (!home_dir) {
ccd4ffa41a1b Use XDG configuration directory if a config file exists
Mikael Berthe <mikael@lilotux.net>
parents: 2164
diff changeset
126 scr_log_print(LPRINT_LOG, "Can't find home dir!");
ccd4ffa41a1b Use XDG configuration directory if a config file exists
Mikael Berthe <mikael@lilotux.net>
parents: 2164
diff changeset
127 fprintf(stderr, "Can't find home dir!\n");
ccd4ffa41a1b Use XDG configuration directory if a config file exists
Mikael Berthe <mikael@lilotux.net>
parents: 2164
diff changeset
128 return NULL;
ccd4ffa41a1b Use XDG configuration directory if a config file exists
Mikael Berthe <mikael@lilotux.net>
parents: 2164
diff changeset
129 }
ccd4ffa41a1b Use XDG configuration directory if a config file exists
Mikael Berthe <mikael@lilotux.net>
parents: 2164
diff changeset
130
ccd4ffa41a1b Use XDG configuration directory if a config file exists
Mikael Berthe <mikael@lilotux.net>
parents: 2164
diff changeset
131 sfilename = g_string_new("");
ccd4ffa41a1b Use XDG configuration directory if a config file exists
Mikael Berthe <mikael@lilotux.net>
parents: 2164
diff changeset
132
ccd4ffa41a1b Use XDG configuration directory if a config file exists
Mikael Berthe <mikael@lilotux.net>
parents: 2164
diff changeset
133 // First try: $HOME/.mcabber/mcabberrc
ccd4ffa41a1b Use XDG configuration directory if a config file exists
Mikael Berthe <mikael@lilotux.net>
parents: 2164
diff changeset
134 g_string_printf(sfilename, "%s/.mcabber/mcabberrc", home_dir);
ccd4ffa41a1b Use XDG configuration directory if a config file exists
Mikael Berthe <mikael@lilotux.net>
parents: 2164
diff changeset
135 if ((fp = fopen(sfilename->str, "r")) != NULL) {
ccd4ffa41a1b Use XDG configuration directory if a config file exists
Mikael Berthe <mikael@lilotux.net>
parents: 2164
diff changeset
136 fclose(fp);
ccd4ffa41a1b Use XDG configuration directory if a config file exists
Mikael Berthe <mikael@lilotux.net>
parents: 2164
diff changeset
137 config_dir = g_strdup_printf("%s/.mcabber", home_dir);
ccd4ffa41a1b Use XDG configuration directory if a config file exists
Mikael Berthe <mikael@lilotux.net>
parents: 2164
diff changeset
138 }
ccd4ffa41a1b Use XDG configuration directory if a config file exists
Mikael Berthe <mikael@lilotux.net>
parents: 2164
diff changeset
139
ccd4ffa41a1b Use XDG configuration directory if a config file exists
Mikael Berthe <mikael@lilotux.net>
parents: 2164
diff changeset
140 // Second guess: Try to use the XDG standard configuration directory
ccd4ffa41a1b Use XDG configuration directory if a config file exists
Mikael Berthe <mikael@lilotux.net>
parents: 2164
diff changeset
141 if (!config_dir) {
ccd4ffa41a1b Use XDG configuration directory if a config file exists
Mikael Berthe <mikael@lilotux.net>
parents: 2164
diff changeset
142 char *xdg_config_dir = g_strdup(getenv("XDG_CONFIG_HOME"));
ccd4ffa41a1b Use XDG configuration directory if a config file exists
Mikael Berthe <mikael@lilotux.net>
parents: 2164
diff changeset
143 if (!xdg_config_dir || !*xdg_config_dir) {
ccd4ffa41a1b Use XDG configuration directory if a config file exists
Mikael Berthe <mikael@lilotux.net>
parents: 2164
diff changeset
144 // Free the string if it is non-null but empty
ccd4ffa41a1b Use XDG configuration directory if a config file exists
Mikael Berthe <mikael@lilotux.net>
parents: 2164
diff changeset
145 if (xdg_config_dir) g_free(xdg_config_dir);
ccd4ffa41a1b Use XDG configuration directory if a config file exists
Mikael Berthe <mikael@lilotux.net>
parents: 2164
diff changeset
146 xdg_config_dir = g_strdup_printf("%s/.config", home_dir);
ccd4ffa41a1b Use XDG configuration directory if a config file exists
Mikael Berthe <mikael@lilotux.net>
parents: 2164
diff changeset
147 }
ccd4ffa41a1b Use XDG configuration directory if a config file exists
Mikael Berthe <mikael@lilotux.net>
parents: 2164
diff changeset
148
ccd4ffa41a1b Use XDG configuration directory if a config file exists
Mikael Berthe <mikael@lilotux.net>
parents: 2164
diff changeset
149 if (xdg_config_dir) {
ccd4ffa41a1b Use XDG configuration directory if a config file exists
Mikael Berthe <mikael@lilotux.net>
parents: 2164
diff changeset
150 int fd = -1;
ccd4ffa41a1b Use XDG configuration directory if a config file exists
Mikael Berthe <mikael@lilotux.net>
parents: 2164
diff changeset
151 struct stat statbuf;
ccd4ffa41a1b Use XDG configuration directory if a config file exists
Mikael Berthe <mikael@lilotux.net>
parents: 2164
diff changeset
152
ccd4ffa41a1b Use XDG configuration directory if a config file exists
Mikael Berthe <mikael@lilotux.net>
parents: 2164
diff changeset
153 if (*xdg_config_dir)
ccd4ffa41a1b Use XDG configuration directory if a config file exists
Mikael Berthe <mikael@lilotux.net>
parents: 2164
diff changeset
154 fd = stat(xdg_config_dir, &statbuf);
ccd4ffa41a1b Use XDG configuration directory if a config file exists
Mikael Berthe <mikael@lilotux.net>
parents: 2164
diff changeset
155
ccd4ffa41a1b Use XDG configuration directory if a config file exists
Mikael Berthe <mikael@lilotux.net>
parents: 2164
diff changeset
156 // If the XDG configuration directory exists, see if we can find a
ccd4ffa41a1b Use XDG configuration directory if a config file exists
Mikael Berthe <mikael@lilotux.net>
parents: 2164
diff changeset
157 // configuration file for mcabber inside.
ccd4ffa41a1b Use XDG configuration directory if a config file exists
Mikael Berthe <mikael@lilotux.net>
parents: 2164
diff changeset
158 if (fd != -1) {
ccd4ffa41a1b Use XDG configuration directory if a config file exists
Mikael Berthe <mikael@lilotux.net>
parents: 2164
diff changeset
159 char *xdg_mcabber_dir = g_strdup_printf("%s/mcabber", xdg_config_dir);
ccd4ffa41a1b Use XDG configuration directory if a config file exists
Mikael Berthe <mikael@lilotux.net>
parents: 2164
diff changeset
160 g_string_printf(sfilename, "%s/mcabberrc", xdg_mcabber_dir);
ccd4ffa41a1b Use XDG configuration directory if a config file exists
Mikael Berthe <mikael@lilotux.net>
parents: 2164
diff changeset
161 if ((fp = fopen(sfilename->str, "r")) != NULL) {
ccd4ffa41a1b Use XDG configuration directory if a config file exists
Mikael Berthe <mikael@lilotux.net>
parents: 2164
diff changeset
162 fclose(fp);
ccd4ffa41a1b Use XDG configuration directory if a config file exists
Mikael Berthe <mikael@lilotux.net>
parents: 2164
diff changeset
163 config_dir = xdg_mcabber_dir;
ccd4ffa41a1b Use XDG configuration directory if a config file exists
Mikael Berthe <mikael@lilotux.net>
parents: 2164
diff changeset
164 } else {
ccd4ffa41a1b Use XDG configuration directory if a config file exists
Mikael Berthe <mikael@lilotux.net>
parents: 2164
diff changeset
165 g_free(xdg_mcabber_dir);
ccd4ffa41a1b Use XDG configuration directory if a config file exists
Mikael Berthe <mikael@lilotux.net>
parents: 2164
diff changeset
166 }
ccd4ffa41a1b Use XDG configuration directory if a config file exists
Mikael Berthe <mikael@lilotux.net>
parents: 2164
diff changeset
167 }
ccd4ffa41a1b Use XDG configuration directory if a config file exists
Mikael Berthe <mikael@lilotux.net>
parents: 2164
diff changeset
168 g_free(xdg_config_dir);
ccd4ffa41a1b Use XDG configuration directory if a config file exists
Mikael Berthe <mikael@lilotux.net>
parents: 2164
diff changeset
169 }
ccd4ffa41a1b Use XDG configuration directory if a config file exists
Mikael Berthe <mikael@lilotux.net>
parents: 2164
diff changeset
170 }
ccd4ffa41a1b Use XDG configuration directory if a config file exists
Mikael Berthe <mikael@lilotux.net>
parents: 2164
diff changeset
171
2253
5a107c907e71 Read $HOME/.mcabberrc if there is no mcabber configuration directory
Mikael Berthe <mikael@lilotux.net>
parents: 2204
diff changeset
172 if (!config_dir)
5a107c907e71 Read $HOME/.mcabberrc if there is no mcabber configuration directory
Mikael Berthe <mikael@lilotux.net>
parents: 2204
diff changeset
173 scr_log_print(LPRINT_NORMAL, "Cannot find configuration directory!\n");
2204
ccd4ffa41a1b Use XDG configuration directory if a config file exists
Mikael Berthe <mikael@lilotux.net>
parents: 2164
diff changeset
174
ccd4ffa41a1b Use XDG configuration directory if a config file exists
Mikael Berthe <mikael@lilotux.net>
parents: 2164
diff changeset
175 g_string_free(sfilename, TRUE);
ccd4ffa41a1b Use XDG configuration directory if a config file exists
Mikael Berthe <mikael@lilotux.net>
parents: 2164
diff changeset
176 return config_dir;
ccd4ffa41a1b Use XDG configuration directory if a config file exists
Mikael Berthe <mikael@lilotux.net>
parents: 2164
diff changeset
177 }
ccd4ffa41a1b Use XDG configuration directory if a config file exists
Mikael Berthe <mikael@lilotux.net>
parents: 2164
diff changeset
178
1192
7b8765c10abb New command: /source
Mikael Berthe <mikael@lilotux.net>
parents: 1187
diff changeset
179 // cfg_read_file(filename, mainfile)
341
dea407d53fe6 Improve configuration file reading
Mikael Berthe <mikael@lilotux.net>
parents: 337
diff changeset
180 // Read and parse config file "filename". If filename is NULL,
dea407d53fe6 Improve configuration file reading
Mikael Berthe <mikael@lilotux.net>
parents: 337
diff changeset
181 // try to open the configuration file at the default locations.
1192
7b8765c10abb New command: /source
Mikael Berthe <mikael@lilotux.net>
parents: 1187
diff changeset
182 // mainfile must be set to TRUE for the startup config file.
7b8765c10abb New command: /source
Mikael Berthe <mikael@lilotux.net>
parents: 1187
diff changeset
183 // If mainfile is TRUE, the permissions of the configuration file will
7b8765c10abb New command: /source
Mikael Berthe <mikael@lilotux.net>
parents: 1187
diff changeset
184 // be fixed if they're insecure.
341
dea407d53fe6 Improve configuration file reading
Mikael Berthe <mikael@lilotux.net>
parents: 337
diff changeset
185 //
1192
7b8765c10abb New command: /source
Mikael Berthe <mikael@lilotux.net>
parents: 1187
diff changeset
186 int cfg_read_file(char *filename, guint mainfile)
341
dea407d53fe6 Improve configuration file reading
Mikael Berthe <mikael@lilotux.net>
parents: 337
diff changeset
187 {
1358
005df14df743 Extend command /source
Mikael Berthe <mikael@lilotux.net>
parents: 1299
diff changeset
188 static unsigned int runtime;
341
dea407d53fe6 Improve configuration file reading
Mikael Berthe <mikael@lilotux.net>
parents: 337
diff changeset
189 FILE *fp;
dea407d53fe6 Improve configuration file reading
Mikael Berthe <mikael@lilotux.net>
parents: 337
diff changeset
190 char *buf;
dea407d53fe6 Improve configuration file reading
Mikael Berthe <mikael@lilotux.net>
parents: 337
diff changeset
191 char *line, *eol;
dea407d53fe6 Improve configuration file reading
Mikael Berthe <mikael@lilotux.net>
parents: 337
diff changeset
192 unsigned int ln = 0;
dea407d53fe6 Improve configuration file reading
Mikael Berthe <mikael@lilotux.net>
parents: 337
diff changeset
193 int err = 0;
dea407d53fe6 Improve configuration file reading
Mikael Berthe <mikael@lilotux.net>
parents: 337
diff changeset
194
dea407d53fe6 Improve configuration file reading
Mikael Berthe <mikael@lilotux.net>
parents: 337
diff changeset
195 if (!filename) {
2204
ccd4ffa41a1b Use XDG configuration directory if a config file exists
Mikael Berthe <mikael@lilotux.net>
parents: 2164
diff changeset
196 const gchar *mcabber_conf_dir;
ccd4ffa41a1b Use XDG configuration directory if a config file exists
Mikael Berthe <mikael@lilotux.net>
parents: 2164
diff changeset
197 gchar *def_filename;
1192
7b8765c10abb New command: /source
Mikael Berthe <mikael@lilotux.net>
parents: 1187
diff changeset
198
7b8765c10abb New command: /source
Mikael Berthe <mikael@lilotux.net>
parents: 1187
diff changeset
199 if (!mainfile) {
7b8765c10abb New command: /source
Mikael Berthe <mikael@lilotux.net>
parents: 1187
diff changeset
200 scr_LogPrint(LPRINT_LOGNORM, "No file name provided");
7b8765c10abb New command: /source
Mikael Berthe <mikael@lilotux.net>
parents: 1187
diff changeset
201 return -1;
7b8765c10abb New command: /source
Mikael Berthe <mikael@lilotux.net>
parents: 1187
diff changeset
202 }
7b8765c10abb New command: /source
Mikael Berthe <mikael@lilotux.net>
parents: 1187
diff changeset
203
2204
ccd4ffa41a1b Use XDG configuration directory if a config file exists
Mikael Berthe <mikael@lilotux.net>
parents: 2164
diff changeset
204 mcabber_conf_dir = settings_get_mcabber_config_dir();
2253
5a107c907e71 Read $HOME/.mcabberrc if there is no mcabber configuration directory
Mikael Berthe <mikael@lilotux.net>
parents: 2204
diff changeset
205 if (!mcabber_conf_dir) {
5a107c907e71 Read $HOME/.mcabberrc if there is no mcabber configuration directory
Mikael Berthe <mikael@lilotux.net>
parents: 2204
diff changeset
206 // Try home directory
5a107c907e71 Read $HOME/.mcabberrc if there is no mcabber configuration directory
Mikael Berthe <mikael@lilotux.net>
parents: 2204
diff changeset
207 const char *home_dir = getenv("HOME");
5a107c907e71 Read $HOME/.mcabberrc if there is no mcabber configuration directory
Mikael Berthe <mikael@lilotux.net>
parents: 2204
diff changeset
208 if (!home_dir) {
5a107c907e71 Read $HOME/.mcabberrc if there is no mcabber configuration directory
Mikael Berthe <mikael@lilotux.net>
parents: 2204
diff changeset
209 scr_log_print(LPRINT_NORMAL, "Cannot find any configuration file!\n");
5a107c907e71 Read $HOME/.mcabberrc if there is no mcabber configuration directory
Mikael Berthe <mikael@lilotux.net>
parents: 2204
diff changeset
210 err = -1;
5a107c907e71 Read $HOME/.mcabberrc if there is no mcabber configuration directory
Mikael Berthe <mikael@lilotux.net>
parents: 2204
diff changeset
211 goto cfg_read_file_return;
5a107c907e71 Read $HOME/.mcabberrc if there is no mcabber configuration directory
Mikael Berthe <mikael@lilotux.net>
parents: 2204
diff changeset
212 }
5a107c907e71 Read $HOME/.mcabberrc if there is no mcabber configuration directory
Mikael Berthe <mikael@lilotux.net>
parents: 2204
diff changeset
213 def_filename = g_strdup_printf("%s/.mcabberrc", home_dir);
5a107c907e71 Read $HOME/.mcabberrc if there is no mcabber configuration directory
Mikael Berthe <mikael@lilotux.net>
parents: 2204
diff changeset
214 } else {
5a107c907e71 Read $HOME/.mcabberrc if there is no mcabber configuration directory
Mikael Berthe <mikael@lilotux.net>
parents: 2204
diff changeset
215 def_filename = g_strdup_printf("%s/mcabberrc", mcabber_conf_dir);
5a107c907e71 Read $HOME/.mcabberrc if there is no mcabber configuration directory
Mikael Berthe <mikael@lilotux.net>
parents: 2204
diff changeset
216 }
2204
ccd4ffa41a1b Use XDG configuration directory if a config file exists
Mikael Berthe <mikael@lilotux.net>
parents: 2164
diff changeset
217
ccd4ffa41a1b Use XDG configuration directory if a config file exists
Mikael Berthe <mikael@lilotux.net>
parents: 2164
diff changeset
218 if ((fp = fopen(def_filename, "r")) == NULL) {
ccd4ffa41a1b Use XDG configuration directory if a config file exists
Mikael Berthe <mikael@lilotux.net>
parents: 2164
diff changeset
219 fprintf(stderr, "Cannot open config file!\n");
ccd4ffa41a1b Use XDG configuration directory if a config file exists
Mikael Berthe <mikael@lilotux.net>
parents: 2164
diff changeset
220 g_free(def_filename);
1358
005df14df743 Extend command /source
Mikael Berthe <mikael@lilotux.net>
parents: 1299
diff changeset
221 err = -1;
005df14df743 Extend command /source
Mikael Berthe <mikael@lilotux.net>
parents: 1299
diff changeset
222 goto cfg_read_file_return;
341
dea407d53fe6 Improve configuration file reading
Mikael Berthe <mikael@lilotux.net>
parents: 337
diff changeset
223 }
362
d8f147d6e872 Check directory and config file permissions
Mikael Berthe <mikael@lilotux.net>
parents: 341
diff changeset
224 // Check configuration file permissions
1358
005df14df743 Extend command /source
Mikael Berthe <mikael@lilotux.net>
parents: 1299
diff changeset
225 // As it could contain sensitive data, we make it user-readable only.
2204
ccd4ffa41a1b Use XDG configuration directory if a config file exists
Mikael Berthe <mikael@lilotux.net>
parents: 2164
diff changeset
226 checkset_perm(def_filename, TRUE);
ccd4ffa41a1b Use XDG configuration directory if a config file exists
Mikael Berthe <mikael@lilotux.net>
parents: 2164
diff changeset
227 scr_log_print(LPRINT_LOGNORM, "Reading %s", def_filename);
2253
5a107c907e71 Read $HOME/.mcabberrc if there is no mcabber configuration directory
Mikael Berthe <mikael@lilotux.net>
parents: 2204
diff changeset
228
5a107c907e71 Read $HOME/.mcabberrc if there is no mcabber configuration directory
Mikael Berthe <mikael@lilotux.net>
parents: 2204
diff changeset
229 // Check mcabber directory permissions.
5a107c907e71 Read $HOME/.mcabberrc if there is no mcabber configuration directory
Mikael Berthe <mikael@lilotux.net>
parents: 2204
diff changeset
230 // Here we just warn, we don't change the mode.
5a107c907e71 Read $HOME/.mcabberrc if there is no mcabber configuration directory
Mikael Berthe <mikael@lilotux.net>
parents: 2204
diff changeset
231 if (mcabber_conf_dir)
5a107c907e71 Read $HOME/.mcabberrc if there is no mcabber configuration directory
Mikael Berthe <mikael@lilotux.net>
parents: 2204
diff changeset
232 checkset_perm(mcabber_conf_dir, FALSE);
5a107c907e71 Read $HOME/.mcabberrc if there is no mcabber configuration directory
Mikael Berthe <mikael@lilotux.net>
parents: 2204
diff changeset
233
2204
ccd4ffa41a1b Use XDG configuration directory if a config file exists
Mikael Berthe <mikael@lilotux.net>
parents: 2164
diff changeset
234 g_free(def_filename);
362
d8f147d6e872 Check directory and config file permissions
Mikael Berthe <mikael@lilotux.net>
parents: 341
diff changeset
235 } else {
1383
d9606bd03144 Small code cleanup
Mikael Berthe <mikael@lilotux.net>
parents: 1359
diff changeset
236 // filename was specified
362
d8f147d6e872 Check directory and config file permissions
Mikael Berthe <mikael@lilotux.net>
parents: 341
diff changeset
237 if ((fp = fopen(filename, "r")) == NULL) {
1192
7b8765c10abb New command: /source
Mikael Berthe <mikael@lilotux.net>
parents: 1187
diff changeset
238 const char *msg = "Cannot open configuration file";
7b8765c10abb New command: /source
Mikael Berthe <mikael@lilotux.net>
parents: 1187
diff changeset
239 if (mainfile)
7b8765c10abb New command: /source
Mikael Berthe <mikael@lilotux.net>
parents: 1187
diff changeset
240 perror(msg);
7b8765c10abb New command: /source
Mikael Berthe <mikael@lilotux.net>
parents: 1187
diff changeset
241 else
7b8765c10abb New command: /source
Mikael Berthe <mikael@lilotux.net>
parents: 1187
diff changeset
242 scr_LogPrint(LPRINT_LOGNORM, "%s (%s).", msg, filename);
1358
005df14df743 Extend command /source
Mikael Berthe <mikael@lilotux.net>
parents: 1299
diff changeset
243 err = -2;
005df14df743 Extend command /source
Mikael Berthe <mikael@lilotux.net>
parents: 1299
diff changeset
244 goto cfg_read_file_return;
362
d8f147d6e872 Check directory and config file permissions
Mikael Berthe <mikael@lilotux.net>
parents: 341
diff changeset
245 }
d8f147d6e872 Check directory and config file permissions
Mikael Berthe <mikael@lilotux.net>
parents: 341
diff changeset
246 // Check configuration file permissions (see above)
1192
7b8765c10abb New command: /source
Mikael Berthe <mikael@lilotux.net>
parents: 1187
diff changeset
247 // We don't change the permissions if that's not the main file.
1214
9f5c5f176953 Do not check file permissions when using /source
Mikael Berthe <mikael@lilotux.net>
parents: 1205
diff changeset
248 if (mainfile)
9f5c5f176953 Do not check file permissions when using /source
Mikael Berthe <mikael@lilotux.net>
parents: 1205
diff changeset
249 checkset_perm(filename, TRUE);
1192
7b8765c10abb New command: /source
Mikael Berthe <mikael@lilotux.net>
parents: 1187
diff changeset
250 scr_LogPrint(LPRINT_LOGNORM, "Reading %s", filename);
341
dea407d53fe6 Improve configuration file reading
Mikael Berthe <mikael@lilotux.net>
parents: 337
diff changeset
251 }
dea407d53fe6 Improve configuration file reading
Mikael Berthe <mikael@lilotux.net>
parents: 337
diff changeset
252
1278
c3107650d165 Allow longer lines in config file
Mikael Berthe <mikael@lilotux.net>
parents: 1272
diff changeset
253 buf = g_new(char, CONFLINE_LENGTH+1);
341
dea407d53fe6 Improve configuration file reading
Mikael Berthe <mikael@lilotux.net>
parents: 337
diff changeset
254
1278
c3107650d165 Allow longer lines in config file
Mikael Berthe <mikael@lilotux.net>
parents: 1272
diff changeset
255 while (fgets(buf+1, CONFLINE_LENGTH, fp) != NULL) {
341
dea407d53fe6 Improve configuration file reading
Mikael Berthe <mikael@lilotux.net>
parents: 337
diff changeset
256 // The first char is reserved to add a '/', to make a command line
dea407d53fe6 Improve configuration file reading
Mikael Berthe <mikael@lilotux.net>
parents: 337
diff changeset
257 line = buf+1;
dea407d53fe6 Improve configuration file reading
Mikael Berthe <mikael@lilotux.net>
parents: 337
diff changeset
258 ln++;
dea407d53fe6 Improve configuration file reading
Mikael Berthe <mikael@lilotux.net>
parents: 337
diff changeset
259
dea407d53fe6 Improve configuration file reading
Mikael Berthe <mikael@lilotux.net>
parents: 337
diff changeset
260 // Strip leading spaces
dea407d53fe6 Improve configuration file reading
Mikael Berthe <mikael@lilotux.net>
parents: 337
diff changeset
261 while (isspace(*line))
dea407d53fe6 Improve configuration file reading
Mikael Berthe <mikael@lilotux.net>
parents: 337
diff changeset
262 line++;
dea407d53fe6 Improve configuration file reading
Mikael Berthe <mikael@lilotux.net>
parents: 337
diff changeset
263
dea407d53fe6 Improve configuration file reading
Mikael Berthe <mikael@lilotux.net>
parents: 337
diff changeset
264 // Make eol point to the last char of the line
dea407d53fe6 Improve configuration file reading
Mikael Berthe <mikael@lilotux.net>
parents: 337
diff changeset
265 for (eol = line ; *eol ; eol++)
dea407d53fe6 Improve configuration file reading
Mikael Berthe <mikael@lilotux.net>
parents: 337
diff changeset
266 ;
dea407d53fe6 Improve configuration file reading
Mikael Berthe <mikael@lilotux.net>
parents: 337
diff changeset
267 if (eol > line)
dea407d53fe6 Improve configuration file reading
Mikael Berthe <mikael@lilotux.net>
parents: 337
diff changeset
268 eol--;
dea407d53fe6 Improve configuration file reading
Mikael Berthe <mikael@lilotux.net>
parents: 337
diff changeset
269
dea407d53fe6 Improve configuration file reading
Mikael Berthe <mikael@lilotux.net>
parents: 337
diff changeset
270 // Strip trailing spaces
dea407d53fe6 Improve configuration file reading
Mikael Berthe <mikael@lilotux.net>
parents: 337
diff changeset
271 while (eol > line && isspace(*eol))
dea407d53fe6 Improve configuration file reading
Mikael Berthe <mikael@lilotux.net>
parents: 337
diff changeset
272 *eol-- = 0;
dea407d53fe6 Improve configuration file reading
Mikael Berthe <mikael@lilotux.net>
parents: 337
diff changeset
273
dea407d53fe6 Improve configuration file reading
Mikael Berthe <mikael@lilotux.net>
parents: 337
diff changeset
274 // Ignore empty lines and comments
dea407d53fe6 Improve configuration file reading
Mikael Berthe <mikael@lilotux.net>
parents: 337
diff changeset
275 if ((*line == '\n') || (*line == '\0') || (*line == '#'))
dea407d53fe6 Improve configuration file reading
Mikael Berthe <mikael@lilotux.net>
parents: 337
diff changeset
276 continue;
dea407d53fe6 Improve configuration file reading
Mikael Berthe <mikael@lilotux.net>
parents: 337
diff changeset
277
1988
dd65a18dc480 Add cmd_set_safe() / cmd_is_safe() (Myhailo Danylenko)
Mikael Berthe <mikael@lilotux.net>
parents: 1811
diff changeset
278 // If we aren't in runtime (i.e. startup) we'll only accept "safe" commands
dd65a18dc480 Add cmd_set_safe() / cmd_is_safe() (Myhailo Danylenko)
Mikael Berthe <mikael@lilotux.net>
parents: 1811
diff changeset
279 if (!runtime) {
dd65a18dc480 Add cmd_set_safe() / cmd_is_safe() (Myhailo Danylenko)
Mikael Berthe <mikael@lilotux.net>
parents: 1811
diff changeset
280 const gchar *cmdend = strchr(line, ' ');
dd65a18dc480 Add cmd_set_safe() / cmd_is_safe() (Myhailo Danylenko)
Mikael Berthe <mikael@lilotux.net>
parents: 1811
diff changeset
281 gchar *cmdname = NULL;
dd65a18dc480 Add cmd_set_safe() / cmd_is_safe() (Myhailo Danylenko)
Mikael Berthe <mikael@lilotux.net>
parents: 1811
diff changeset
282 gboolean safe;
dd65a18dc480 Add cmd_set_safe() / cmd_is_safe() (Myhailo Danylenko)
Mikael Berthe <mikael@lilotux.net>
parents: 1811
diff changeset
283 if (cmdend)
dd65a18dc480 Add cmd_set_safe() / cmd_is_safe() (Myhailo Danylenko)
Mikael Berthe <mikael@lilotux.net>
parents: 1811
diff changeset
284 cmdname = g_strndup(line, cmdend - line);
dd65a18dc480 Add cmd_set_safe() / cmd_is_safe() (Myhailo Danylenko)
Mikael Berthe <mikael@lilotux.net>
parents: 1811
diff changeset
285 safe = cmd_is_safe(cmdname ? cmdname : line);
dd65a18dc480 Add cmd_set_safe() / cmd_is_safe() (Myhailo Danylenko)
Mikael Berthe <mikael@lilotux.net>
parents: 1811
diff changeset
286 g_free(cmdname);
dd65a18dc480 Add cmd_set_safe() / cmd_is_safe() (Myhailo Danylenko)
Mikael Berthe <mikael@lilotux.net>
parents: 1811
diff changeset
287 if (!safe) {
dd65a18dc480 Add cmd_set_safe() / cmd_is_safe() (Myhailo Danylenko)
Mikael Berthe <mikael@lilotux.net>
parents: 1811
diff changeset
288 scr_log_print(LPRINT_LOGNORM, "Error in configuration file (l. %d): "
dd65a18dc480 Add cmd_set_safe() / cmd_is_safe() (Myhailo Danylenko)
Mikael Berthe <mikael@lilotux.net>
parents: 1811
diff changeset
289 "this command can't be used here", ln);
341
dea407d53fe6 Improve configuration file reading
Mikael Berthe <mikael@lilotux.net>
parents: 337
diff changeset
290 err++;
dea407d53fe6 Improve configuration file reading
Mikael Berthe <mikael@lilotux.net>
parents: 337
diff changeset
291 continue;
dea407d53fe6 Improve configuration file reading
Mikael Berthe <mikael@lilotux.net>
parents: 337
diff changeset
292 }
dea407d53fe6 Improve configuration file reading
Mikael Berthe <mikael@lilotux.net>
parents: 337
diff changeset
293 }
1988
dd65a18dc480 Add cmd_set_safe() / cmd_is_safe() (Myhailo Danylenko)
Mikael Berthe <mikael@lilotux.net>
parents: 1811
diff changeset
294
dd65a18dc480 Add cmd_set_safe() / cmd_is_safe() (Myhailo Danylenko)
Mikael Berthe <mikael@lilotux.net>
parents: 1811
diff changeset
295 // Set the leading COMMAND_CHAR to build a command line
dd65a18dc480 Add cmd_set_safe() / cmd_is_safe() (Myhailo Danylenko)
Mikael Berthe <mikael@lilotux.net>
parents: 1811
diff changeset
296 // and process the command
dd65a18dc480 Add cmd_set_safe() / cmd_is_safe() (Myhailo Danylenko)
Mikael Berthe <mikael@lilotux.net>
parents: 1811
diff changeset
297 *(--line) = COMMAND_CHAR;
2164
038c4d601011 Simplify handling of command '/quit'
franky
parents: 1988
diff changeset
298 process_command(line, TRUE);
341
dea407d53fe6 Improve configuration file reading
Mikael Berthe <mikael@lilotux.net>
parents: 337
diff changeset
299 }
dea407d53fe6 Improve configuration file reading
Mikael Berthe <mikael@lilotux.net>
parents: 337
diff changeset
300 g_free(buf);
dea407d53fe6 Improve configuration file reading
Mikael Berthe <mikael@lilotux.net>
parents: 337
diff changeset
301 fclose(fp);
1192
7b8765c10abb New command: /source
Mikael Berthe <mikael@lilotux.net>
parents: 1187
diff changeset
302
7b8765c10abb New command: /source
Mikael Berthe <mikael@lilotux.net>
parents: 1187
diff changeset
303 if (filename)
7b8765c10abb New command: /source
Mikael Berthe <mikael@lilotux.net>
parents: 1187
diff changeset
304 scr_LogPrint(LPRINT_LOGNORM, "Loaded %s.", filename);
1358
005df14df743 Extend command /source
Mikael Berthe <mikael@lilotux.net>
parents: 1299
diff changeset
305
005df14df743 Extend command /source
Mikael Berthe <mikael@lilotux.net>
parents: 1299
diff changeset
306 cfg_read_file_return:
005df14df743 Extend command /source
Mikael Berthe <mikael@lilotux.net>
parents: 1299
diff changeset
307 // If we're done with the main file parsing, we can assume that
005df14df743 Extend command /source
Mikael Berthe <mikael@lilotux.net>
parents: 1299
diff changeset
308 // the next time this function is called will be at run time.
005df14df743 Extend command /source
Mikael Berthe <mikael@lilotux.net>
parents: 1299
diff changeset
309 if (mainfile)
005df14df743 Extend command /source
Mikael Berthe <mikael@lilotux.net>
parents: 1299
diff changeset
310 runtime = TRUE;
341
dea407d53fe6 Improve configuration file reading
Mikael Berthe <mikael@lilotux.net>
parents: 337
diff changeset
311 return err;
dea407d53fe6 Improve configuration file reading
Mikael Berthe <mikael@lilotux.net>
parents: 337
diff changeset
312 }
dea407d53fe6 Improve configuration file reading
Mikael Berthe <mikael@lilotux.net>
parents: 337
diff changeset
313
280
68ce34b4243b Add parse_assigment() function
Mikael Berthe <mikael@lilotux.net>
parents: 279
diff changeset
314 // parse_assigment(assignment, pkey, pval)
68ce34b4243b Add parse_assigment() function
Mikael Berthe <mikael@lilotux.net>
parents: 279
diff changeset
315 // Read assignment and split it to key, value
68ce34b4243b Add parse_assigment() function
Mikael Berthe <mikael@lilotux.net>
parents: 279
diff changeset
316 //
68ce34b4243b Add parse_assigment() function
Mikael Berthe <mikael@lilotux.net>
parents: 279
diff changeset
317 // If this is an assignment, the function will return TRUE and
68ce34b4243b Add parse_assigment() function
Mikael Berthe <mikael@lilotux.net>
parents: 279
diff changeset
318 // set *pkey and *pval (*pval is set to NULL if value field is empty).
68ce34b4243b Add parse_assigment() function
Mikael Berthe <mikael@lilotux.net>
parents: 279
diff changeset
319 //
68ce34b4243b Add parse_assigment() function
Mikael Berthe <mikael@lilotux.net>
parents: 279
diff changeset
320 // If this isn't a assignment (no = char), the function will set *pval
68ce34b4243b Add parse_assigment() function
Mikael Berthe <mikael@lilotux.net>
parents: 279
diff changeset
321 // to NULL and return FALSE.
68ce34b4243b Add parse_assigment() function
Mikael Berthe <mikael@lilotux.net>
parents: 279
diff changeset
322 //
774
46304b773a44 Remove useless checks before g_free() calls
Mikael Berthe <mikael@lilotux.net>
parents: 764
diff changeset
323 // The caller should g_free() *pkey and *pval (if not NULL) after use.
1074
b2fc694a8228 Fix a few memory leaks after calls to parse_assigment()
Mikael Berthe <mikael@lilotux.net>
parents: 1070
diff changeset
324 guint parse_assigment(gchar *assignment, gchar **pkey, gchar **pval)
280
68ce34b4243b Add parse_assigment() function
Mikael Berthe <mikael@lilotux.net>
parents: 279
diff changeset
325 {
293
d0295e735768 Assignment lvalue (key, option name, alias...) cannnot contain spaces
Mikael Berthe <mikael@lilotux.net>
parents: 288
diff changeset
326 char *key, *val, *t, *p;
280
68ce34b4243b Add parse_assigment() function
Mikael Berthe <mikael@lilotux.net>
parents: 279
diff changeset
327
68ce34b4243b Add parse_assigment() function
Mikael Berthe <mikael@lilotux.net>
parents: 279
diff changeset
328 *pkey = *pval = NULL;
68ce34b4243b Add parse_assigment() function
Mikael Berthe <mikael@lilotux.net>
parents: 279
diff changeset
329
68ce34b4243b Add parse_assigment() function
Mikael Berthe <mikael@lilotux.net>
parents: 279
diff changeset
330 key = assignment;
68ce34b4243b Add parse_assigment() function
Mikael Berthe <mikael@lilotux.net>
parents: 279
diff changeset
331 // Remove leading spaces in option name
68ce34b4243b Add parse_assigment() function
Mikael Berthe <mikael@lilotux.net>
parents: 279
diff changeset
332 while ((!isalnum(*key)) && (*key != '=') && *key) {
68ce34b4243b Add parse_assigment() function
Mikael Berthe <mikael@lilotux.net>
parents: 279
diff changeset
333 key++;
68ce34b4243b Add parse_assigment() function
Mikael Berthe <mikael@lilotux.net>
parents: 279
diff changeset
334 }
68ce34b4243b Add parse_assigment() function
Mikael Berthe <mikael@lilotux.net>
parents: 279
diff changeset
335 if (!*key) return FALSE; // Empty assignment
68ce34b4243b Add parse_assigment() function
Mikael Berthe <mikael@lilotux.net>
parents: 279
diff changeset
336
68ce34b4243b Add parse_assigment() function
Mikael Berthe <mikael@lilotux.net>
parents: 279
diff changeset
337 if (*key == '=') {
68ce34b4243b Add parse_assigment() function
Mikael Berthe <mikael@lilotux.net>
parents: 279
diff changeset
338 return FALSE;
68ce34b4243b Add parse_assigment() function
Mikael Berthe <mikael@lilotux.net>
parents: 279
diff changeset
339 }
68ce34b4243b Add parse_assigment() function
Mikael Berthe <mikael@lilotux.net>
parents: 279
diff changeset
340 // Ok, key points to the option name
68ce34b4243b Add parse_assigment() function
Mikael Berthe <mikael@lilotux.net>
parents: 279
diff changeset
341
68ce34b4243b Add parse_assigment() function
Mikael Berthe <mikael@lilotux.net>
parents: 279
diff changeset
342 for (val = key+1 ; *val && (*val != '=') ; val++)
68ce34b4243b Add parse_assigment() function
Mikael Berthe <mikael@lilotux.net>
parents: 279
diff changeset
343 if (!isalnum(*val) && !isblank(*val) && (*val != '_') && (*val != '-')) {
68ce34b4243b Add parse_assigment() function
Mikael Berthe <mikael@lilotux.net>
parents: 279
diff changeset
344 // Key should only have alnum chars...
68ce34b4243b Add parse_assigment() function
Mikael Berthe <mikael@lilotux.net>
parents: 279
diff changeset
345 return FALSE;
68ce34b4243b Add parse_assigment() function
Mikael Berthe <mikael@lilotux.net>
parents: 279
diff changeset
346 }
68ce34b4243b Add parse_assigment() function
Mikael Berthe <mikael@lilotux.net>
parents: 279
diff changeset
347 // Remove trailing spaces in option name:
68ce34b4243b Add parse_assigment() function
Mikael Berthe <mikael@lilotux.net>
parents: 279
diff changeset
348 for (t = val-1 ; t > key && isblank(*t) ; t--)
68ce34b4243b Add parse_assigment() function
Mikael Berthe <mikael@lilotux.net>
parents: 279
diff changeset
349 ;
293
d0295e735768 Assignment lvalue (key, option name, alias...) cannnot contain spaces
Mikael Berthe <mikael@lilotux.net>
parents: 288
diff changeset
350 // Check for embedded whitespace characters
d0295e735768 Assignment lvalue (key, option name, alias...) cannnot contain spaces
Mikael Berthe <mikael@lilotux.net>
parents: 288
diff changeset
351 for (p = key; p < t; p++) {
d0295e735768 Assignment lvalue (key, option name, alias...) cannnot contain spaces
Mikael Berthe <mikael@lilotux.net>
parents: 288
diff changeset
352 if (isblank(*p)) {
1729
e6e89b1d7831 Minor style and header updates
Mikael Berthe <mikael@lilotux.net>
parents: 1673
diff changeset
353 // Name should not contain space chars...
293
d0295e735768 Assignment lvalue (key, option name, alias...) cannnot contain spaces
Mikael Berthe <mikael@lilotux.net>
parents: 288
diff changeset
354 return FALSE;
d0295e735768 Assignment lvalue (key, option name, alias...) cannnot contain spaces
Mikael Berthe <mikael@lilotux.net>
parents: 288
diff changeset
355 }
d0295e735768 Assignment lvalue (key, option name, alias...) cannnot contain spaces
Mikael Berthe <mikael@lilotux.net>
parents: 288
diff changeset
356 }
d0295e735768 Assignment lvalue (key, option name, alias...) cannnot contain spaces
Mikael Berthe <mikael@lilotux.net>
parents: 288
diff changeset
357
280
68ce34b4243b Add parse_assigment() function
Mikael Berthe <mikael@lilotux.net>
parents: 279
diff changeset
358 *pkey = g_strndup(key, t+1-key);
68ce34b4243b Add parse_assigment() function
Mikael Berthe <mikael@lilotux.net>
parents: 279
diff changeset
359
68ce34b4243b Add parse_assigment() function
Mikael Berthe <mikael@lilotux.net>
parents: 279
diff changeset
360 if (!*val) return FALSE; // Not an assignment
68ce34b4243b Add parse_assigment() function
Mikael Berthe <mikael@lilotux.net>
parents: 279
diff changeset
361
68ce34b4243b Add parse_assigment() function
Mikael Berthe <mikael@lilotux.net>
parents: 279
diff changeset
362 // Remove leading and trailing spaces in option value:
68ce34b4243b Add parse_assigment() function
Mikael Berthe <mikael@lilotux.net>
parents: 279
diff changeset
363 for (val++; *val && isblank(*val) ; val++) ;
68ce34b4243b Add parse_assigment() function
Mikael Berthe <mikael@lilotux.net>
parents: 279
diff changeset
364 for (t = val ; *t ; t++) ;
68ce34b4243b Add parse_assigment() function
Mikael Berthe <mikael@lilotux.net>
parents: 279
diff changeset
365 for (t-- ; t >= val && isblank(*t) ; t--) ;
68ce34b4243b Add parse_assigment() function
Mikael Berthe <mikael@lilotux.net>
parents: 279
diff changeset
366
282
87d6ac21cd1b Fix "Cannot unset option" bug
Mikael Berthe <mikael@lilotux.net>
parents: 281
diff changeset
367 if (t < val) return TRUE; // no value (variable reset for example)
280
68ce34b4243b Add parse_assigment() function
Mikael Berthe <mikael@lilotux.net>
parents: 279
diff changeset
368
337
3a25be278864 Values can be enclosed by quotes in assignments
Mikael Berthe <mikael@lilotux.net>
parents: 336
diff changeset
369 // If the value begins and ends with quotes ("), these quotes are
3a25be278864 Values can be enclosed by quotes in assignments
Mikael Berthe <mikael@lilotux.net>
parents: 336
diff changeset
370 // removed and whitespace is not stripped
3a25be278864 Values can be enclosed by quotes in assignments
Mikael Berthe <mikael@lilotux.net>
parents: 336
diff changeset
371 if ((t>val) && (*val == '"' && *t == '"')) {
3a25be278864 Values can be enclosed by quotes in assignments
Mikael Berthe <mikael@lilotux.net>
parents: 336
diff changeset
372 val++;
3a25be278864 Values can be enclosed by quotes in assignments
Mikael Berthe <mikael@lilotux.net>
parents: 336
diff changeset
373 t--;
3a25be278864 Values can be enclosed by quotes in assignments
Mikael Berthe <mikael@lilotux.net>
parents: 336
diff changeset
374 }
280
68ce34b4243b Add parse_assigment() function
Mikael Berthe <mikael@lilotux.net>
parents: 279
diff changeset
375 *pval = g_strndup(val, t+1-val);
68ce34b4243b Add parse_assigment() function
Mikael Berthe <mikael@lilotux.net>
parents: 279
diff changeset
376 return TRUE;
68ce34b4243b Add parse_assigment() function
Mikael Berthe <mikael@lilotux.net>
parents: 279
diff changeset
377 }
68ce34b4243b Add parse_assigment() function
Mikael Berthe <mikael@lilotux.net>
parents: 279
diff changeset
378
1768
d80a9e32ab1a Refuse to replace existing guards
Myhailo Danylenko <isbear@ukrpost.net>
parents: 1736
diff changeset
379 gboolean settings_set_guard(const gchar *key, settings_guard_t guard)
1673
552da310b83e Add option guards
Myhailo Danylenko <isbear@ukrpost.net>
parents: 1668
diff changeset
380 {
552da310b83e Add option guards
Myhailo Danylenko <isbear@ukrpost.net>
parents: 1668
diff changeset
381 if (!guard)
552da310b83e Add option guards
Myhailo Danylenko <isbear@ukrpost.net>
parents: 1668
diff changeset
382 g_hash_table_remove(guards, key);
1768
d80a9e32ab1a Refuse to replace existing guards
Myhailo Danylenko <isbear@ukrpost.net>
parents: 1736
diff changeset
383 else {
d80a9e32ab1a Refuse to replace existing guards
Myhailo Danylenko <isbear@ukrpost.net>
parents: 1736
diff changeset
384 installed_guard_t *iguard = g_hash_table_lookup(guards, key);
d80a9e32ab1a Refuse to replace existing guards
Myhailo Danylenko <isbear@ukrpost.net>
parents: 1736
diff changeset
385 if (iguard)
d80a9e32ab1a Refuse to replace existing guards
Myhailo Danylenko <isbear@ukrpost.net>
parents: 1736
diff changeset
386 return FALSE;
d80a9e32ab1a Refuse to replace existing guards
Myhailo Danylenko <isbear@ukrpost.net>
parents: 1736
diff changeset
387 iguard = g_new(installed_guard_t, 1);
d80a9e32ab1a Refuse to replace existing guards
Myhailo Danylenko <isbear@ukrpost.net>
parents: 1736
diff changeset
388 iguard->guard = guard;
d80a9e32ab1a Refuse to replace existing guards
Myhailo Danylenko <isbear@ukrpost.net>
parents: 1736
diff changeset
389 g_hash_table_insert(guards, g_strdup(key), iguard);
d80a9e32ab1a Refuse to replace existing guards
Myhailo Danylenko <isbear@ukrpost.net>
parents: 1736
diff changeset
390 }
d80a9e32ab1a Refuse to replace existing guards
Myhailo Danylenko <isbear@ukrpost.net>
parents: 1736
diff changeset
391 return TRUE;
1673
552da310b83e Add option guards
Myhailo Danylenko <isbear@ukrpost.net>
parents: 1668
diff changeset
392 }
552da310b83e Add option guards
Myhailo Danylenko <isbear@ukrpost.net>
parents: 1668
diff changeset
393
552da310b83e Add option guards
Myhailo Danylenko <isbear@ukrpost.net>
parents: 1668
diff changeset
394 void settings_del_guard(const gchar *key)
552da310b83e Add option guards
Myhailo Danylenko <isbear@ukrpost.net>
parents: 1668
diff changeset
395 {
552da310b83e Add option guards
Myhailo Danylenko <isbear@ukrpost.net>
parents: 1668
diff changeset
396 settings_set_guard(key, NULL);
552da310b83e Add option guards
Myhailo Danylenko <isbear@ukrpost.net>
parents: 1668
diff changeset
397 }
552da310b83e Add option guards
Myhailo Danylenko <isbear@ukrpost.net>
parents: 1668
diff changeset
398
552da310b83e Add option guards
Myhailo Danylenko <isbear@ukrpost.net>
parents: 1668
diff changeset
399 void settings_opt_set_raw(const gchar *key, const gchar *value)
552da310b83e Add option guards
Myhailo Danylenko <isbear@ukrpost.net>
parents: 1668
diff changeset
400 {
552da310b83e Add option guards
Myhailo Danylenko <isbear@ukrpost.net>
parents: 1668
diff changeset
401 if (!value)
552da310b83e Add option guards
Myhailo Danylenko <isbear@ukrpost.net>
parents: 1668
diff changeset
402 g_hash_table_remove(option, key);
552da310b83e Add option guards
Myhailo Danylenko <isbear@ukrpost.net>
parents: 1668
diff changeset
403 else
552da310b83e Add option guards
Myhailo Danylenko <isbear@ukrpost.net>
parents: 1668
diff changeset
404 g_hash_table_insert(option, g_strdup(key), g_strdup(value));
552da310b83e Add option guards
Myhailo Danylenko <isbear@ukrpost.net>
parents: 1668
diff changeset
405 }
552da310b83e Add option guards
Myhailo Danylenko <isbear@ukrpost.net>
parents: 1668
diff changeset
406
281
f562b9af2de7 Add "const" specifier in prototypes
Mikael Berthe <mikael@lilotux.net>
parents: 280
diff changeset
407 void settings_set(guint type, const gchar *key, const gchar *value)
279
f5dd437c057b Rewrite the settings system
Mikael Berthe <mikael@lilotux.net>
parents:
diff changeset
408 {
1070
9eaacc0ad3a2 Use a hash for settings
Mikael Berthe <mikael@lilotux.net>
parents: 1068
diff changeset
409 GHashTable *hash;
1673
552da310b83e Add option guards
Myhailo Danylenko <isbear@ukrpost.net>
parents: 1668
diff changeset
410 gchar *dup_value = NULL;
1794
58d1390f28ca Fix ignore of NULL guard retval (introduced in d80a9e32ab1a)
Myhailo Danylenko <isbear@ukrpost.net>
parents: 1768
diff changeset
411 installed_guard_t *guard = NULL;
1673
552da310b83e Add option guards
Myhailo Danylenko <isbear@ukrpost.net>
parents: 1668
diff changeset
412
552da310b83e Add option guards
Myhailo Danylenko <isbear@ukrpost.net>
parents: 1668
diff changeset
413 if (type == SETTINGS_TYPE_OPTION) {
1794
58d1390f28ca Fix ignore of NULL guard retval (introduced in d80a9e32ab1a)
Myhailo Danylenko <isbear@ukrpost.net>
parents: 1768
diff changeset
414 guard = g_hash_table_lookup(guards, key);
1673
552da310b83e Add option guards
Myhailo Danylenko <isbear@ukrpost.net>
parents: 1668
diff changeset
415 if (guard)
1768
d80a9e32ab1a Refuse to replace existing guards
Myhailo Danylenko <isbear@ukrpost.net>
parents: 1736
diff changeset
416 dup_value = guard->guard(key, value);
1673
552da310b83e Add option guards
Myhailo Danylenko <isbear@ukrpost.net>
parents: 1668
diff changeset
417 }
279
f5dd437c057b Rewrite the settings system
Mikael Berthe <mikael@lilotux.net>
parents:
diff changeset
418
1070
9eaacc0ad3a2 Use a hash for settings
Mikael Berthe <mikael@lilotux.net>
parents: 1068
diff changeset
419 hash = get_hash(type);
9eaacc0ad3a2 Use a hash for settings
Mikael Berthe <mikael@lilotux.net>
parents: 1068
diff changeset
420 if (!hash)
9eaacc0ad3a2 Use a hash for settings
Mikael Berthe <mikael@lilotux.net>
parents: 1068
diff changeset
421 return;
9eaacc0ad3a2 Use a hash for settings
Mikael Berthe <mikael@lilotux.net>
parents: 1068
diff changeset
422
1673
552da310b83e Add option guards
Myhailo Danylenko <isbear@ukrpost.net>
parents: 1668
diff changeset
423 if (!value && !dup_value)
1070
9eaacc0ad3a2 Use a hash for settings
Mikael Berthe <mikael@lilotux.net>
parents: 1068
diff changeset
424 g_hash_table_remove(hash, key);
1673
552da310b83e Add option guards
Myhailo Danylenko <isbear@ukrpost.net>
parents: 1668
diff changeset
425 else if (!guard)
1070
9eaacc0ad3a2 Use a hash for settings
Mikael Berthe <mikael@lilotux.net>
parents: 1068
diff changeset
426 g_hash_table_insert(hash, g_strdup(key), g_strdup(value));
1673
552da310b83e Add option guards
Myhailo Danylenko <isbear@ukrpost.net>
parents: 1668
diff changeset
427 else if (dup_value)
552da310b83e Add option guards
Myhailo Danylenko <isbear@ukrpost.net>
parents: 1668
diff changeset
428 g_hash_table_insert(hash, g_strdup(key), dup_value);
552da310b83e Add option guards
Myhailo Danylenko <isbear@ukrpost.net>
parents: 1668
diff changeset
429 else
552da310b83e Add option guards
Myhailo Danylenko <isbear@ukrpost.net>
parents: 1668
diff changeset
430 g_hash_table_remove(option, key);
279
f5dd437c057b Rewrite the settings system
Mikael Berthe <mikael@lilotux.net>
parents:
diff changeset
431 }
f5dd437c057b Rewrite the settings system
Mikael Berthe <mikael@lilotux.net>
parents:
diff changeset
432
281
f562b9af2de7 Add "const" specifier in prototypes
Mikael Berthe <mikael@lilotux.net>
parents: 280
diff changeset
433 void settings_del(guint type, const gchar *key)
279
f5dd437c057b Rewrite the settings system
Mikael Berthe <mikael@lilotux.net>
parents:
diff changeset
434 {
f5dd437c057b Rewrite the settings system
Mikael Berthe <mikael@lilotux.net>
parents:
diff changeset
435 settings_set(type, key, NULL);
f5dd437c057b Rewrite the settings system
Mikael Berthe <mikael@lilotux.net>
parents:
diff changeset
436 }
f5dd437c057b Rewrite the settings system
Mikael Berthe <mikael@lilotux.net>
parents:
diff changeset
437
281
f562b9af2de7 Add "const" specifier in prototypes
Mikael Berthe <mikael@lilotux.net>
parents: 280
diff changeset
438 const gchar *settings_get(guint type, const gchar *key)
279
f5dd437c057b Rewrite the settings system
Mikael Berthe <mikael@lilotux.net>
parents:
diff changeset
439 {
1070
9eaacc0ad3a2 Use a hash for settings
Mikael Berthe <mikael@lilotux.net>
parents: 1068
diff changeset
440 GHashTable *hash;
279
f5dd437c057b Rewrite the settings system
Mikael Berthe <mikael@lilotux.net>
parents:
diff changeset
441
1070
9eaacc0ad3a2 Use a hash for settings
Mikael Berthe <mikael@lilotux.net>
parents: 1068
diff changeset
442 hash = get_hash(type);
9eaacc0ad3a2 Use a hash for settings
Mikael Berthe <mikael@lilotux.net>
parents: 1068
diff changeset
443 if (!hash)
9eaacc0ad3a2 Use a hash for settings
Mikael Berthe <mikael@lilotux.net>
parents: 1068
diff changeset
444 return NULL;
279
f5dd437c057b Rewrite the settings system
Mikael Berthe <mikael@lilotux.net>
parents:
diff changeset
445
1070
9eaacc0ad3a2 Use a hash for settings
Mikael Berthe <mikael@lilotux.net>
parents: 1068
diff changeset
446 return g_hash_table_lookup(hash, key);
279
f5dd437c057b Rewrite the settings system
Mikael Berthe <mikael@lilotux.net>
parents:
diff changeset
447 }
f5dd437c057b Rewrite the settings system
Mikael Berthe <mikael@lilotux.net>
parents:
diff changeset
448
281
f562b9af2de7 Add "const" specifier in prototypes
Mikael Berthe <mikael@lilotux.net>
parents: 280
diff changeset
449 int settings_get_int(guint type, const gchar *key)
279
f5dd437c057b Rewrite the settings system
Mikael Berthe <mikael@lilotux.net>
parents:
diff changeset
450 {
281
f562b9af2de7 Add "const" specifier in prototypes
Mikael Berthe <mikael@lilotux.net>
parents: 280
diff changeset
451 const gchar *setval = settings_get(type, key);
279
f5dd437c057b Rewrite the settings system
Mikael Berthe <mikael@lilotux.net>
parents:
diff changeset
452
f5dd437c057b Rewrite the settings system
Mikael Berthe <mikael@lilotux.net>
parents:
diff changeset
453 if (setval) return atoi(setval);
f5dd437c057b Rewrite the settings system
Mikael Berthe <mikael@lilotux.net>
parents:
diff changeset
454 return 0;
f5dd437c057b Rewrite the settings system
Mikael Berthe <mikael@lilotux.net>
parents:
diff changeset
455 }
f5dd437c057b Rewrite the settings system
Mikael Berthe <mikael@lilotux.net>
parents:
diff changeset
456
294
871e53769084 Allow one status message per Jabber status
Mikael Berthe <mikael@lilotux.net>
parents: 293
diff changeset
457 // settings_get_status_msg(status)
871e53769084 Allow one status message per Jabber status
Mikael Berthe <mikael@lilotux.net>
parents: 293
diff changeset
458 // Return a string with the current status message:
871e53769084 Allow one status message per Jabber status
Mikael Berthe <mikael@lilotux.net>
parents: 293
diff changeset
459 // - if there is a user-defined message ("message" option),
871e53769084 Allow one status message per Jabber status
Mikael Berthe <mikael@lilotux.net>
parents: 293
diff changeset
460 // return this message
871e53769084 Allow one status message per Jabber status
Mikael Berthe <mikael@lilotux.net>
parents: 293
diff changeset
461 // - if there is a user-defined message for the given status (and no
871e53769084 Allow one status message per Jabber status
Mikael Berthe <mikael@lilotux.net>
parents: 293
diff changeset
462 // generic user message), it is returned
521
cc8c969ab6e5 "/status" changes
Mikael Berthe <mikael@lilotux.net>
parents: 393
diff changeset
463 // - if no message is found, return NULL
294
871e53769084 Allow one status message per Jabber status
Mikael Berthe <mikael@lilotux.net>
parents: 293
diff changeset
464 const gchar *settings_get_status_msg(enum imstatus status)
871e53769084 Allow one status message per Jabber status
Mikael Berthe <mikael@lilotux.net>
parents: 293
diff changeset
465 {
871e53769084 Allow one status message per Jabber status
Mikael Berthe <mikael@lilotux.net>
parents: 293
diff changeset
466 const gchar *rstatus = settings_opt_get("message");
871e53769084 Allow one status message per Jabber status
Mikael Berthe <mikael@lilotux.net>
parents: 293
diff changeset
467
871e53769084 Allow one status message per Jabber status
Mikael Berthe <mikael@lilotux.net>
parents: 293
diff changeset
468 if (rstatus) return rstatus;
871e53769084 Allow one status message per Jabber status
Mikael Berthe <mikael@lilotux.net>
parents: 293
diff changeset
469
871e53769084 Allow one status message per Jabber status
Mikael Berthe <mikael@lilotux.net>
parents: 293
diff changeset
470 switch(status) {
871e53769084 Allow one status message per Jabber status
Mikael Berthe <mikael@lilotux.net>
parents: 293
diff changeset
471 case available:
521
cc8c969ab6e5 "/status" changes
Mikael Berthe <mikael@lilotux.net>
parents: 393
diff changeset
472 rstatus = settings_opt_get("message_avail");
294
871e53769084 Allow one status message per Jabber status
Mikael Berthe <mikael@lilotux.net>
parents: 293
diff changeset
473 break;
871e53769084 Allow one status message per Jabber status
Mikael Berthe <mikael@lilotux.net>
parents: 293
diff changeset
474
871e53769084 Allow one status message per Jabber status
Mikael Berthe <mikael@lilotux.net>
parents: 293
diff changeset
475 case freeforchat:
521
cc8c969ab6e5 "/status" changes
Mikael Berthe <mikael@lilotux.net>
parents: 393
diff changeset
476 rstatus = settings_opt_get("message_free");
294
871e53769084 Allow one status message per Jabber status
Mikael Berthe <mikael@lilotux.net>
parents: 293
diff changeset
477 break;
871e53769084 Allow one status message per Jabber status
Mikael Berthe <mikael@lilotux.net>
parents: 293
diff changeset
478
871e53769084 Allow one status message per Jabber status
Mikael Berthe <mikael@lilotux.net>
parents: 293
diff changeset
479 case dontdisturb:
521
cc8c969ab6e5 "/status" changes
Mikael Berthe <mikael@lilotux.net>
parents: 393
diff changeset
480 rstatus = settings_opt_get("message_dnd");
294
871e53769084 Allow one status message per Jabber status
Mikael Berthe <mikael@lilotux.net>
parents: 293
diff changeset
481 break;
871e53769084 Allow one status message per Jabber status
Mikael Berthe <mikael@lilotux.net>
parents: 293
diff changeset
482
871e53769084 Allow one status message per Jabber status
Mikael Berthe <mikael@lilotux.net>
parents: 293
diff changeset
483 case notavail:
521
cc8c969ab6e5 "/status" changes
Mikael Berthe <mikael@lilotux.net>
parents: 393
diff changeset
484 rstatus = settings_opt_get("message_notavail");
294
871e53769084 Allow one status message per Jabber status
Mikael Berthe <mikael@lilotux.net>
parents: 293
diff changeset
485 break;
871e53769084 Allow one status message per Jabber status
Mikael Berthe <mikael@lilotux.net>
parents: 293
diff changeset
486
871e53769084 Allow one status message per Jabber status
Mikael Berthe <mikael@lilotux.net>
parents: 293
diff changeset
487 case away:
521
cc8c969ab6e5 "/status" changes
Mikael Berthe <mikael@lilotux.net>
parents: 393
diff changeset
488 rstatus = settings_opt_get("message_away");
294
871e53769084 Allow one status message per Jabber status
Mikael Berthe <mikael@lilotux.net>
parents: 293
diff changeset
489 break;
871e53769084 Allow one status message per Jabber status
Mikael Berthe <mikael@lilotux.net>
parents: 293
diff changeset
490
521
cc8c969ab6e5 "/status" changes
Mikael Berthe <mikael@lilotux.net>
parents: 393
diff changeset
491 default: // offline, invisible
cc8c969ab6e5 "/status" changes
Mikael Berthe <mikael@lilotux.net>
parents: 393
diff changeset
492 break;
294
871e53769084 Allow one status message per Jabber status
Mikael Berthe <mikael@lilotux.net>
parents: 293
diff changeset
493 }
871e53769084 Allow one status message per Jabber status
Mikael Berthe <mikael@lilotux.net>
parents: 293
diff changeset
494 return rstatus;
871e53769084 Allow one status message per Jabber status
Mikael Berthe <mikael@lilotux.net>
parents: 293
diff changeset
495 }
576
8b3db0b555a1 Add Vim modelines
Mikael Berthe <mikael@lilotux.net>
parents: 521
diff changeset
496
867
7f056c566569 Commands /alias & /bind list the key bindings and aliases
Mikael Berthe <mikael@lilotux.net>
parents: 780
diff changeset
497 // settings_foreach(type, pfunction, param)
1661
64a7428afcb3 Print list of options with '/set'
Myhailo Danylenko <isbear@ukrpost.net>
parents: 1653
diff changeset
498 // Call pfunction(key, value, param) for each setting with requested type.
1070
9eaacc0ad3a2 Use a hash for settings
Mikael Berthe <mikael@lilotux.net>
parents: 1068
diff changeset
499 void settings_foreach(guint type, void (*pfunc)(char *k, char *v, void *param),
867
7f056c566569 Commands /alias & /bind list the key bindings and aliases
Mikael Berthe <mikael@lilotux.net>
parents: 780
diff changeset
500 void *param)
7f056c566569 Commands /alias & /bind list the key bindings and aliases
Mikael Berthe <mikael@lilotux.net>
parents: 780
diff changeset
501 {
1070
9eaacc0ad3a2 Use a hash for settings
Mikael Berthe <mikael@lilotux.net>
parents: 1068
diff changeset
502 GHashTable *hash;
867
7f056c566569 Commands /alias & /bind list the key bindings and aliases
Mikael Berthe <mikael@lilotux.net>
parents: 780
diff changeset
503
1070
9eaacc0ad3a2 Use a hash for settings
Mikael Berthe <mikael@lilotux.net>
parents: 1068
diff changeset
504 hash = get_hash(type);
9eaacc0ad3a2 Use a hash for settings
Mikael Berthe <mikael@lilotux.net>
parents: 1068
diff changeset
505 if (!hash)
9eaacc0ad3a2 Use a hash for settings
Mikael Berthe <mikael@lilotux.net>
parents: 1068
diff changeset
506 return;
867
7f056c566569 Commands /alias & /bind list the key bindings and aliases
Mikael Berthe <mikael@lilotux.net>
parents: 780
diff changeset
507
1070
9eaacc0ad3a2 Use a hash for settings
Mikael Berthe <mikael@lilotux.net>
parents: 1068
diff changeset
508 g_hash_table_foreach(hash, (GHFunc)pfunc, param);
867
7f056c566569 Commands /alias & /bind list the key bindings and aliases
Mikael Berthe <mikael@lilotux.net>
parents: 780
diff changeset
509 }
7f056c566569 Commands /alias & /bind list the key bindings and aliases
Mikael Berthe <mikael@lilotux.net>
parents: 780
diff changeset
510
1004
b57a01ffeed6 Use existing conference bookmarks
Mikael Berthe <mikael@lilotux.net>
parents: 967
diff changeset
511
b57a01ffeed6 Use existing conference bookmarks
Mikael Berthe <mikael@lilotux.net>
parents: 967
diff changeset
512 // default_muc_nickname()
b57a01ffeed6 Use existing conference bookmarks
Mikael Berthe <mikael@lilotux.net>
parents: 967
diff changeset
513 // Return the user's default nickname
b57a01ffeed6 Use existing conference bookmarks
Mikael Berthe <mikael@lilotux.net>
parents: 967
diff changeset
514 // The caller should free the string after use
1395
d431cd75eb53 Use bookmarked nickname when manually joining a room
Mikael Berthe <mikael@lilotux.net>
parents: 1383
diff changeset
515 char *default_muc_nickname(const char *roomid)
1004
b57a01ffeed6 Use existing conference bookmarks
Mikael Berthe <mikael@lilotux.net>
parents: 967
diff changeset
516 {
b57a01ffeed6 Use existing conference bookmarks
Mikael Berthe <mikael@lilotux.net>
parents: 967
diff changeset
517 char *nick;
b57a01ffeed6 Use existing conference bookmarks
Mikael Berthe <mikael@lilotux.net>
parents: 967
diff changeset
518
1598
a087125d8fc8 Replace libjabber with loudmouth
franky
parents: 1565
diff changeset
519 nick = (char*)xmpp_get_bookmark_nick(roomid);
1395
d431cd75eb53 Use bookmarked nickname when manually joining a room
Mikael Berthe <mikael@lilotux.net>
parents: 1383
diff changeset
520 if (nick)
d431cd75eb53 Use bookmarked nickname when manually joining a room
Mikael Berthe <mikael@lilotux.net>
parents: 1383
diff changeset
521 return g_strdup(nick);
d431cd75eb53 Use bookmarked nickname when manually joining a room
Mikael Berthe <mikael@lilotux.net>
parents: 1383
diff changeset
522
1004
b57a01ffeed6 Use existing conference bookmarks
Mikael Berthe <mikael@lilotux.net>
parents: 967
diff changeset
523 // We try the "nickname" option, then the username part of the jid.
b57a01ffeed6 Use existing conference bookmarks
Mikael Berthe <mikael@lilotux.net>
parents: 967
diff changeset
524 nick = (char*)settings_opt_get("nickname");
b57a01ffeed6 Use existing conference bookmarks
Mikael Berthe <mikael@lilotux.net>
parents: 967
diff changeset
525 if (nick)
b57a01ffeed6 Use existing conference bookmarks
Mikael Berthe <mikael@lilotux.net>
parents: 967
diff changeset
526 return g_strdup(nick);
b57a01ffeed6 Use existing conference bookmarks
Mikael Berthe <mikael@lilotux.net>
parents: 967
diff changeset
527
1611
f9bf561e54d0 Use the username for authentication, added jid_get_username() to utils.c
franky
parents: 1607
diff changeset
528 nick = jid_get_username(settings_opt_get("jid"));
1004
b57a01ffeed6 Use existing conference bookmarks
Mikael Berthe <mikael@lilotux.net>
parents: 967
diff changeset
529 return nick;
b57a01ffeed6 Use existing conference bookmarks
Mikael Berthe <mikael@lilotux.net>
parents: 967
diff changeset
530 }
b57a01ffeed6 Use existing conference bookmarks
Mikael Berthe <mikael@lilotux.net>
parents: 967
diff changeset
531
1065
230dca34dbea Extand pgp_data structure
Mikael Berthe <mikael@lilotux.net>
parents: 1004
diff changeset
532
230dca34dbea Extand pgp_data structure
Mikael Berthe <mikael@lilotux.net>
parents: 1004
diff changeset
533 /* PGP settings */
230dca34dbea Extand pgp_data structure
Mikael Berthe <mikael@lilotux.net>
parents: 1004
diff changeset
534
230dca34dbea Extand pgp_data structure
Mikael Berthe <mikael@lilotux.net>
parents: 1004
diff changeset
535 // settings_pgp_setdisabled(jid, value)
230dca34dbea Extand pgp_data structure
Mikael Berthe <mikael@lilotux.net>
parents: 1004
diff changeset
536 // Enable/disable PGP encryption for jid.
230dca34dbea Extand pgp_data structure
Mikael Berthe <mikael@lilotux.net>
parents: 1004
diff changeset
537 // (Set value to TRUE to disable encryption)
230dca34dbea Extand pgp_data structure
Mikael Berthe <mikael@lilotux.net>
parents: 1004
diff changeset
538 void settings_pgp_setdisabled(const char *bjid, guint value)
230dca34dbea Extand pgp_data structure
Mikael Berthe <mikael@lilotux.net>
parents: 1004
diff changeset
539 {
230dca34dbea Extand pgp_data structure
Mikael Berthe <mikael@lilotux.net>
parents: 1004
diff changeset
540 #ifdef HAVE_GPGME
2337
ffd0e57e9563 Defined types shall end with "_t"
franky
parents: 2268
diff changeset
541 pgpopt_t *pgpdata;
1065
230dca34dbea Extand pgp_data structure
Mikael Berthe <mikael@lilotux.net>
parents: 1004
diff changeset
542 pgpdata = g_hash_table_lookup(pgpopt, bjid);
230dca34dbea Extand pgp_data structure
Mikael Berthe <mikael@lilotux.net>
parents: 1004
diff changeset
543 if (!pgpdata) {
230dca34dbea Extand pgp_data structure
Mikael Berthe <mikael@lilotux.net>
parents: 1004
diff changeset
544 // If value is 0, we do not need to create a structure (that's
230dca34dbea Extand pgp_data structure
Mikael Berthe <mikael@lilotux.net>
parents: 1004
diff changeset
545 // the default value).
230dca34dbea Extand pgp_data structure
Mikael Berthe <mikael@lilotux.net>
parents: 1004
diff changeset
546 if (value) {
2337
ffd0e57e9563 Defined types shall end with "_t"
franky
parents: 2268
diff changeset
547 pgpdata = g_new0(pgpopt_t, 1);
1065
230dca34dbea Extand pgp_data structure
Mikael Berthe <mikael@lilotux.net>
parents: 1004
diff changeset
548 pgpdata->pgp_disabled = value;
230dca34dbea Extand pgp_data structure
Mikael Berthe <mikael@lilotux.net>
parents: 1004
diff changeset
549 g_hash_table_insert(pgpopt, g_strdup(bjid), pgpdata);
230dca34dbea Extand pgp_data structure
Mikael Berthe <mikael@lilotux.net>
parents: 1004
diff changeset
550 }
230dca34dbea Extand pgp_data structure
Mikael Berthe <mikael@lilotux.net>
parents: 1004
diff changeset
551 } else {
230dca34dbea Extand pgp_data structure
Mikael Berthe <mikael@lilotux.net>
parents: 1004
diff changeset
552 pgpdata->pgp_disabled = value;
230dca34dbea Extand pgp_data structure
Mikael Berthe <mikael@lilotux.net>
parents: 1004
diff changeset
553 // We could remove the key/value if pgp_disabled is 0 and
230dca34dbea Extand pgp_data structure
Mikael Berthe <mikael@lilotux.net>
parents: 1004
diff changeset
554 // pgp_keyid is NULL, actually.
230dca34dbea Extand pgp_data structure
Mikael Berthe <mikael@lilotux.net>
parents: 1004
diff changeset
555 }
230dca34dbea Extand pgp_data structure
Mikael Berthe <mikael@lilotux.net>
parents: 1004
diff changeset
556 #endif
230dca34dbea Extand pgp_data structure
Mikael Berthe <mikael@lilotux.net>
parents: 1004
diff changeset
557 }
230dca34dbea Extand pgp_data structure
Mikael Berthe <mikael@lilotux.net>
parents: 1004
diff changeset
558
230dca34dbea Extand pgp_data structure
Mikael Berthe <mikael@lilotux.net>
parents: 1004
diff changeset
559 // settings_pgp_getdisabled(jid)
230dca34dbea Extand pgp_data structure
Mikael Berthe <mikael@lilotux.net>
parents: 1004
diff changeset
560 // Return TRUE if PGP encryption should be disabled for jid.
230dca34dbea Extand pgp_data structure
Mikael Berthe <mikael@lilotux.net>
parents: 1004
diff changeset
561 guint settings_pgp_getdisabled(const char *bjid)
230dca34dbea Extand pgp_data structure
Mikael Berthe <mikael@lilotux.net>
parents: 1004
diff changeset
562 {
230dca34dbea Extand pgp_data structure
Mikael Berthe <mikael@lilotux.net>
parents: 1004
diff changeset
563 #ifdef HAVE_GPGME
2337
ffd0e57e9563 Defined types shall end with "_t"
franky
parents: 2268
diff changeset
564 pgpopt_t *pgpdata;
1065
230dca34dbea Extand pgp_data structure
Mikael Berthe <mikael@lilotux.net>
parents: 1004
diff changeset
565 pgpdata = g_hash_table_lookup(pgpopt, bjid);
230dca34dbea Extand pgp_data structure
Mikael Berthe <mikael@lilotux.net>
parents: 1004
diff changeset
566 if (pgpdata)
230dca34dbea Extand pgp_data structure
Mikael Berthe <mikael@lilotux.net>
parents: 1004
diff changeset
567 return pgpdata->pgp_disabled;
230dca34dbea Extand pgp_data structure
Mikael Berthe <mikael@lilotux.net>
parents: 1004
diff changeset
568 else
1197
6f602d3270a4 Add /pgp [-]force
Mikael Berthe <mikael@lilotux.net>
parents: 1192
diff changeset
569 return FALSE; // Default: not disabled
1065
230dca34dbea Extand pgp_data structure
Mikael Berthe <mikael@lilotux.net>
parents: 1004
diff changeset
570 #else
230dca34dbea Extand pgp_data structure
Mikael Berthe <mikael@lilotux.net>
parents: 1004
diff changeset
571 return TRUE; // No PGP support, let's say it's disabled.
230dca34dbea Extand pgp_data structure
Mikael Berthe <mikael@lilotux.net>
parents: 1004
diff changeset
572 #endif
230dca34dbea Extand pgp_data structure
Mikael Berthe <mikael@lilotux.net>
parents: 1004
diff changeset
573 }
230dca34dbea Extand pgp_data structure
Mikael Berthe <mikael@lilotux.net>
parents: 1004
diff changeset
574
1197
6f602d3270a4 Add /pgp [-]force
Mikael Berthe <mikael@lilotux.net>
parents: 1192
diff changeset
575 // settings_pgp_setforce(jid, value)
6f602d3270a4 Add /pgp [-]force
Mikael Berthe <mikael@lilotux.net>
parents: 1192
diff changeset
576 // Force (or not) PGP encryption for jid.
6f602d3270a4 Add /pgp [-]force
Mikael Berthe <mikael@lilotux.net>
parents: 1192
diff changeset
577 // When value is TRUE, PGP support will be assumed for the remote client.
6f602d3270a4 Add /pgp [-]force
Mikael Berthe <mikael@lilotux.net>
parents: 1192
diff changeset
578 void settings_pgp_setforce(const char *bjid, guint value)
6f602d3270a4 Add /pgp [-]force
Mikael Berthe <mikael@lilotux.net>
parents: 1192
diff changeset
579 {
6f602d3270a4 Add /pgp [-]force
Mikael Berthe <mikael@lilotux.net>
parents: 1192
diff changeset
580 #ifdef HAVE_GPGME
2337
ffd0e57e9563 Defined types shall end with "_t"
franky
parents: 2268
diff changeset
581 pgpopt_t *pgpdata;
1197
6f602d3270a4 Add /pgp [-]force
Mikael Berthe <mikael@lilotux.net>
parents: 1192
diff changeset
582 pgpdata = g_hash_table_lookup(pgpopt, bjid);
6f602d3270a4 Add /pgp [-]force
Mikael Berthe <mikael@lilotux.net>
parents: 1192
diff changeset
583 if (!pgpdata) {
6f602d3270a4 Add /pgp [-]force
Mikael Berthe <mikael@lilotux.net>
parents: 1192
diff changeset
584 // If value is 0, we do not need to create a structure (that's
6f602d3270a4 Add /pgp [-]force
Mikael Berthe <mikael@lilotux.net>
parents: 1192
diff changeset
585 // the default value).
6f602d3270a4 Add /pgp [-]force
Mikael Berthe <mikael@lilotux.net>
parents: 1192
diff changeset
586 if (value) {
2337
ffd0e57e9563 Defined types shall end with "_t"
franky
parents: 2268
diff changeset
587 pgpdata = g_new0(pgpopt_t, 1);
1197
6f602d3270a4 Add /pgp [-]force
Mikael Berthe <mikael@lilotux.net>
parents: 1192
diff changeset
588 pgpdata->pgp_force = value;
6f602d3270a4 Add /pgp [-]force
Mikael Berthe <mikael@lilotux.net>
parents: 1192
diff changeset
589 g_hash_table_insert(pgpopt, g_strdup(bjid), pgpdata);
6f602d3270a4 Add /pgp [-]force
Mikael Berthe <mikael@lilotux.net>
parents: 1192
diff changeset
590 }
6f602d3270a4 Add /pgp [-]force
Mikael Berthe <mikael@lilotux.net>
parents: 1192
diff changeset
591 } else {
6f602d3270a4 Add /pgp [-]force
Mikael Berthe <mikael@lilotux.net>
parents: 1192
diff changeset
592 pgpdata->pgp_force = value;
6f602d3270a4 Add /pgp [-]force
Mikael Berthe <mikael@lilotux.net>
parents: 1192
diff changeset
593 }
1565
bff9633e38ee Fix segfault in command /pgp (reported by Maxim Vuets)
Mikael Berthe <mikael@lilotux.net>
parents: 1519
diff changeset
594 if (value && pgpdata && !pgpdata->pgp_keyid)
1197
6f602d3270a4 Add /pgp [-]force
Mikael Berthe <mikael@lilotux.net>
parents: 1192
diff changeset
595 scr_LogPrint(LPRINT_NORMAL, "Warning: the Key Id is not set!");
6f602d3270a4 Add /pgp [-]force
Mikael Berthe <mikael@lilotux.net>
parents: 1192
diff changeset
596 #endif
6f602d3270a4 Add /pgp [-]force
Mikael Berthe <mikael@lilotux.net>
parents: 1192
diff changeset
597 }
6f602d3270a4 Add /pgp [-]force
Mikael Berthe <mikael@lilotux.net>
parents: 1192
diff changeset
598
6f602d3270a4 Add /pgp [-]force
Mikael Berthe <mikael@lilotux.net>
parents: 1192
diff changeset
599 // settings_pgp_getforce(jid)
6f602d3270a4 Add /pgp [-]force
Mikael Berthe <mikael@lilotux.net>
parents: 1192
diff changeset
600 // Return TRUE if PGP enforcement is set for jid.
6f602d3270a4 Add /pgp [-]force
Mikael Berthe <mikael@lilotux.net>
parents: 1192
diff changeset
601 guint settings_pgp_getforce(const char *bjid)
6f602d3270a4 Add /pgp [-]force
Mikael Berthe <mikael@lilotux.net>
parents: 1192
diff changeset
602 {
6f602d3270a4 Add /pgp [-]force
Mikael Berthe <mikael@lilotux.net>
parents: 1192
diff changeset
603 #ifdef HAVE_GPGME
2337
ffd0e57e9563 Defined types shall end with "_t"
franky
parents: 2268
diff changeset
604 pgpopt_t *pgpdata;
1197
6f602d3270a4 Add /pgp [-]force
Mikael Berthe <mikael@lilotux.net>
parents: 1192
diff changeset
605 pgpdata = g_hash_table_lookup(pgpopt, bjid);
6f602d3270a4 Add /pgp [-]force
Mikael Berthe <mikael@lilotux.net>
parents: 1192
diff changeset
606 if (pgpdata)
6f602d3270a4 Add /pgp [-]force
Mikael Berthe <mikael@lilotux.net>
parents: 1192
diff changeset
607 return pgpdata->pgp_force;
6f602d3270a4 Add /pgp [-]force
Mikael Berthe <mikael@lilotux.net>
parents: 1192
diff changeset
608 else
6f602d3270a4 Add /pgp [-]force
Mikael Berthe <mikael@lilotux.net>
parents: 1192
diff changeset
609 return FALSE; // Default
6f602d3270a4 Add /pgp [-]force
Mikael Berthe <mikael@lilotux.net>
parents: 1192
diff changeset
610 #else
6f602d3270a4 Add /pgp [-]force
Mikael Berthe <mikael@lilotux.net>
parents: 1192
diff changeset
611 return FALSE; // No PGP support
6f602d3270a4 Add /pgp [-]force
Mikael Berthe <mikael@lilotux.net>
parents: 1192
diff changeset
612 #endif
6f602d3270a4 Add /pgp [-]force
Mikael Berthe <mikael@lilotux.net>
parents: 1192
diff changeset
613 }
6f602d3270a4 Add /pgp [-]force
Mikael Berthe <mikael@lilotux.net>
parents: 1192
diff changeset
614
1065
230dca34dbea Extand pgp_data structure
Mikael Berthe <mikael@lilotux.net>
parents: 1004
diff changeset
615 // settings_pgp_setkeyid(jid, keyid)
230dca34dbea Extand pgp_data structure
Mikael Berthe <mikael@lilotux.net>
parents: 1004
diff changeset
616 // Set the PGP KeyId for user jid.
230dca34dbea Extand pgp_data structure
Mikael Berthe <mikael@lilotux.net>
parents: 1004
diff changeset
617 // Use keyid = NULL to erase the previous KeyId.
230dca34dbea Extand pgp_data structure
Mikael Berthe <mikael@lilotux.net>
parents: 1004
diff changeset
618 void settings_pgp_setkeyid(const char *bjid, const char *keyid)
230dca34dbea Extand pgp_data structure
Mikael Berthe <mikael@lilotux.net>
parents: 1004
diff changeset
619 {
230dca34dbea Extand pgp_data structure
Mikael Berthe <mikael@lilotux.net>
parents: 1004
diff changeset
620 #ifdef HAVE_GPGME
2337
ffd0e57e9563 Defined types shall end with "_t"
franky
parents: 2268
diff changeset
621 pgpopt_t *pgpdata;
1065
230dca34dbea Extand pgp_data structure
Mikael Berthe <mikael@lilotux.net>
parents: 1004
diff changeset
622 pgpdata = g_hash_table_lookup(pgpopt, bjid);
230dca34dbea Extand pgp_data structure
Mikael Berthe <mikael@lilotux.net>
parents: 1004
diff changeset
623 if (!pgpdata) {
230dca34dbea Extand pgp_data structure
Mikael Berthe <mikael@lilotux.net>
parents: 1004
diff changeset
624 // If keyid is NULL, we do not need to create a structure (that's
230dca34dbea Extand pgp_data structure
Mikael Berthe <mikael@lilotux.net>
parents: 1004
diff changeset
625 // the default value).
230dca34dbea Extand pgp_data structure
Mikael Berthe <mikael@lilotux.net>
parents: 1004
diff changeset
626 if (keyid) {
2337
ffd0e57e9563 Defined types shall end with "_t"
franky
parents: 2268
diff changeset
627 pgpdata = g_new0(pgpopt_t, 1);
1065
230dca34dbea Extand pgp_data structure
Mikael Berthe <mikael@lilotux.net>
parents: 1004
diff changeset
628 pgpdata->pgp_keyid = g_strdup(keyid);
230dca34dbea Extand pgp_data structure
Mikael Berthe <mikael@lilotux.net>
parents: 1004
diff changeset
629 g_hash_table_insert(pgpopt, g_strdup(bjid), pgpdata);
230dca34dbea Extand pgp_data structure
Mikael Berthe <mikael@lilotux.net>
parents: 1004
diff changeset
630 }
230dca34dbea Extand pgp_data structure
Mikael Berthe <mikael@lilotux.net>
parents: 1004
diff changeset
631 } else {
230dca34dbea Extand pgp_data structure
Mikael Berthe <mikael@lilotux.net>
parents: 1004
diff changeset
632 g_free(pgpdata->pgp_keyid);
230dca34dbea Extand pgp_data structure
Mikael Berthe <mikael@lilotux.net>
parents: 1004
diff changeset
633 if (keyid)
230dca34dbea Extand pgp_data structure
Mikael Berthe <mikael@lilotux.net>
parents: 1004
diff changeset
634 pgpdata->pgp_keyid = g_strdup(keyid);
230dca34dbea Extand pgp_data structure
Mikael Berthe <mikael@lilotux.net>
parents: 1004
diff changeset
635 else
230dca34dbea Extand pgp_data structure
Mikael Berthe <mikael@lilotux.net>
parents: 1004
diff changeset
636 pgpdata->pgp_keyid = NULL;
230dca34dbea Extand pgp_data structure
Mikael Berthe <mikael@lilotux.net>
parents: 1004
diff changeset
637 // We could remove the key/value if pgp_disabled is 0 and
230dca34dbea Extand pgp_data structure
Mikael Berthe <mikael@lilotux.net>
parents: 1004
diff changeset
638 // pgp_keyid is NULL, actually.
230dca34dbea Extand pgp_data structure
Mikael Berthe <mikael@lilotux.net>
parents: 1004
diff changeset
639 }
230dca34dbea Extand pgp_data structure
Mikael Berthe <mikael@lilotux.net>
parents: 1004
diff changeset
640 #endif
230dca34dbea Extand pgp_data structure
Mikael Berthe <mikael@lilotux.net>
parents: 1004
diff changeset
641 }
230dca34dbea Extand pgp_data structure
Mikael Berthe <mikael@lilotux.net>
parents: 1004
diff changeset
642
230dca34dbea Extand pgp_data structure
Mikael Berthe <mikael@lilotux.net>
parents: 1004
diff changeset
643 // settings_pgp_getkeyid(jid)
230dca34dbea Extand pgp_data structure
Mikael Berthe <mikael@lilotux.net>
parents: 1004
diff changeset
644 // Get the PGP KeyId for user jid.
230dca34dbea Extand pgp_data structure
Mikael Berthe <mikael@lilotux.net>
parents: 1004
diff changeset
645 const char *settings_pgp_getkeyid(const char *bjid)
230dca34dbea Extand pgp_data structure
Mikael Berthe <mikael@lilotux.net>
parents: 1004
diff changeset
646 {
230dca34dbea Extand pgp_data structure
Mikael Berthe <mikael@lilotux.net>
parents: 1004
diff changeset
647 #ifdef HAVE_GPGME
2337
ffd0e57e9563 Defined types shall end with "_t"
franky
parents: 2268
diff changeset
648 pgpopt_t *pgpdata;
1065
230dca34dbea Extand pgp_data structure
Mikael Berthe <mikael@lilotux.net>
parents: 1004
diff changeset
649 pgpdata = g_hash_table_lookup(pgpopt, bjid);
230dca34dbea Extand pgp_data structure
Mikael Berthe <mikael@lilotux.net>
parents: 1004
diff changeset
650 if (pgpdata)
230dca34dbea Extand pgp_data structure
Mikael Berthe <mikael@lilotux.net>
parents: 1004
diff changeset
651 return pgpdata->pgp_keyid;
230dca34dbea Extand pgp_data structure
Mikael Berthe <mikael@lilotux.net>
parents: 1004
diff changeset
652 #endif
230dca34dbea Extand pgp_data structure
Mikael Berthe <mikael@lilotux.net>
parents: 1004
diff changeset
653 return NULL;
230dca34dbea Extand pgp_data structure
Mikael Berthe <mikael@lilotux.net>
parents: 1004
diff changeset
654 }
230dca34dbea Extand pgp_data structure
Mikael Berthe <mikael@lilotux.net>
parents: 1004
diff changeset
655
1299
3b338a5c01fc OTR support
Frank Zschockelt <mcabber_otr[at]freakysoft.de>
parents: 1278
diff changeset
656 /* otr settings */
3b338a5c01fc OTR support
Frank Zschockelt <mcabber_otr[at]freakysoft.de>
parents: 1278
diff changeset
657
3b338a5c01fc OTR support
Frank Zschockelt <mcabber_otr[at]freakysoft.de>
parents: 1278
diff changeset
658 #ifdef HAVE_LIBOTR
1598
a087125d8fc8 Replace libjabber with loudmouth
franky
parents: 1565
diff changeset
659 static void remove_default_policies(char *k, char *policy, void *defaultp)
1299
3b338a5c01fc OTR support
Frank Zschockelt <mcabber_otr[at]freakysoft.de>
parents: 1278
diff changeset
660 {
3b338a5c01fc OTR support
Frank Zschockelt <mcabber_otr[at]freakysoft.de>
parents: 1278
diff changeset
661 if (*(enum otr_policy *)policy == *(enum otr_policy *)defaultp) {
3b338a5c01fc OTR support
Frank Zschockelt <mcabber_otr[at]freakysoft.de>
parents: 1278
diff changeset
662 g_hash_table_remove(otrpolicy, k);
3b338a5c01fc OTR support
Frank Zschockelt <mcabber_otr[at]freakysoft.de>
parents: 1278
diff changeset
663 }
3b338a5c01fc OTR support
Frank Zschockelt <mcabber_otr[at]freakysoft.de>
parents: 1278
diff changeset
664 }
3b338a5c01fc OTR support
Frank Zschockelt <mcabber_otr[at]freakysoft.de>
parents: 1278
diff changeset
665 #endif
3b338a5c01fc OTR support
Frank Zschockelt <mcabber_otr[at]freakysoft.de>
parents: 1278
diff changeset
666
3b338a5c01fc OTR support
Frank Zschockelt <mcabber_otr[at]freakysoft.de>
parents: 1278
diff changeset
667 void settings_otr_setpolicy(const char *bjid, guint value)
3b338a5c01fc OTR support
Frank Zschockelt <mcabber_otr[at]freakysoft.de>
parents: 1278
diff changeset
668 {
3b338a5c01fc OTR support
Frank Zschockelt <mcabber_otr[at]freakysoft.de>
parents: 1278
diff changeset
669 #ifdef HAVE_LIBOTR
3b338a5c01fc OTR support
Frank Zschockelt <mcabber_otr[at]freakysoft.de>
parents: 1278
diff changeset
670 enum otr_policy *otrdata;
3b338a5c01fc OTR support
Frank Zschockelt <mcabber_otr[at]freakysoft.de>
parents: 1278
diff changeset
671
3b338a5c01fc OTR support
Frank Zschockelt <mcabber_otr[at]freakysoft.de>
parents: 1278
diff changeset
672 if (!bjid) {
3b338a5c01fc OTR support
Frank Zschockelt <mcabber_otr[at]freakysoft.de>
parents: 1278
diff changeset
673 default_policy = value;
3b338a5c01fc OTR support
Frank Zschockelt <mcabber_otr[at]freakysoft.de>
parents: 1278
diff changeset
674 /* refresh hash */
3b338a5c01fc OTR support
Frank Zschockelt <mcabber_otr[at]freakysoft.de>
parents: 1278
diff changeset
675 settings_foreach(SETTINGS_TYPE_OTR, &remove_default_policies, &value);
3b338a5c01fc OTR support
Frank Zschockelt <mcabber_otr[at]freakysoft.de>
parents: 1278
diff changeset
676 return;
3b338a5c01fc OTR support
Frank Zschockelt <mcabber_otr[at]freakysoft.de>
parents: 1278
diff changeset
677 }
3b338a5c01fc OTR support
Frank Zschockelt <mcabber_otr[at]freakysoft.de>
parents: 1278
diff changeset
678
3b338a5c01fc OTR support
Frank Zschockelt <mcabber_otr[at]freakysoft.de>
parents: 1278
diff changeset
679 otrdata = g_hash_table_lookup(otrpolicy, bjid);
3b338a5c01fc OTR support
Frank Zschockelt <mcabber_otr[at]freakysoft.de>
parents: 1278
diff changeset
680
3b338a5c01fc OTR support
Frank Zschockelt <mcabber_otr[at]freakysoft.de>
parents: 1278
diff changeset
681 if (value == default_policy) {
3b338a5c01fc OTR support
Frank Zschockelt <mcabber_otr[at]freakysoft.de>
parents: 1278
diff changeset
682 if (otrdata) {
3b338a5c01fc OTR support
Frank Zschockelt <mcabber_otr[at]freakysoft.de>
parents: 1278
diff changeset
683 g_hash_table_remove(otrpolicy, bjid);
3b338a5c01fc OTR support
Frank Zschockelt <mcabber_otr[at]freakysoft.de>
parents: 1278
diff changeset
684 }
3b338a5c01fc OTR support
Frank Zschockelt <mcabber_otr[at]freakysoft.de>
parents: 1278
diff changeset
685 } else if (otrdata) {
3b338a5c01fc OTR support
Frank Zschockelt <mcabber_otr[at]freakysoft.de>
parents: 1278
diff changeset
686 *otrdata = value;
3b338a5c01fc OTR support
Frank Zschockelt <mcabber_otr[at]freakysoft.de>
parents: 1278
diff changeset
687 } else {
3b338a5c01fc OTR support
Frank Zschockelt <mcabber_otr[at]freakysoft.de>
parents: 1278
diff changeset
688 otrdata = g_new(enum otr_policy, 1);
3b338a5c01fc OTR support
Frank Zschockelt <mcabber_otr[at]freakysoft.de>
parents: 1278
diff changeset
689 *otrdata = value;
3b338a5c01fc OTR support
Frank Zschockelt <mcabber_otr[at]freakysoft.de>
parents: 1278
diff changeset
690 g_hash_table_insert(otrpolicy, g_strdup(bjid), otrdata);
3b338a5c01fc OTR support
Frank Zschockelt <mcabber_otr[at]freakysoft.de>
parents: 1278
diff changeset
691 }
3b338a5c01fc OTR support
Frank Zschockelt <mcabber_otr[at]freakysoft.de>
parents: 1278
diff changeset
692 #endif
3b338a5c01fc OTR support
Frank Zschockelt <mcabber_otr[at]freakysoft.de>
parents: 1278
diff changeset
693 }
3b338a5c01fc OTR support
Frank Zschockelt <mcabber_otr[at]freakysoft.de>
parents: 1278
diff changeset
694
3b338a5c01fc OTR support
Frank Zschockelt <mcabber_otr[at]freakysoft.de>
parents: 1278
diff changeset
695 guint settings_otr_getpolicy(const char *bjid)
3b338a5c01fc OTR support
Frank Zschockelt <mcabber_otr[at]freakysoft.de>
parents: 1278
diff changeset
696 {
3b338a5c01fc OTR support
Frank Zschockelt <mcabber_otr[at]freakysoft.de>
parents: 1278
diff changeset
697 #ifdef HAVE_LIBOTR
1598
a087125d8fc8 Replace libjabber with loudmouth
franky
parents: 1565
diff changeset
698 enum otr_policy *otrdata;
1299
3b338a5c01fc OTR support
Frank Zschockelt <mcabber_otr[at]freakysoft.de>
parents: 1278
diff changeset
699 if (!bjid)
3b338a5c01fc OTR support
Frank Zschockelt <mcabber_otr[at]freakysoft.de>
parents: 1278
diff changeset
700 return default_policy;
3b338a5c01fc OTR support
Frank Zschockelt <mcabber_otr[at]freakysoft.de>
parents: 1278
diff changeset
701
3b338a5c01fc OTR support
Frank Zschockelt <mcabber_otr[at]freakysoft.de>
parents: 1278
diff changeset
702 otrdata = g_hash_table_lookup(otrpolicy, bjid);
3b338a5c01fc OTR support
Frank Zschockelt <mcabber_otr[at]freakysoft.de>
parents: 1278
diff changeset
703 if (otrdata)
3b338a5c01fc OTR support
Frank Zschockelt <mcabber_otr[at]freakysoft.de>
parents: 1278
diff changeset
704 return *otrdata;
3b338a5c01fc OTR support
Frank Zschockelt <mcabber_otr[at]freakysoft.de>
parents: 1278
diff changeset
705 else
3b338a5c01fc OTR support
Frank Zschockelt <mcabber_otr[at]freakysoft.de>
parents: 1278
diff changeset
706 return default_policy;
3b338a5c01fc OTR support
Frank Zschockelt <mcabber_otr[at]freakysoft.de>
parents: 1278
diff changeset
707 #else
3b338a5c01fc OTR support
Frank Zschockelt <mcabber_otr[at]freakysoft.de>
parents: 1278
diff changeset
708 return 0;
3b338a5c01fc OTR support
Frank Zschockelt <mcabber_otr[at]freakysoft.de>
parents: 1278
diff changeset
709 #endif
3b338a5c01fc OTR support
Frank Zschockelt <mcabber_otr[at]freakysoft.de>
parents: 1278
diff changeset
710 }
3b338a5c01fc OTR support
Frank Zschockelt <mcabber_otr[at]freakysoft.de>
parents: 1278
diff changeset
711
1141
5be2408a6534 Add option "max_history_blocks"
Mikael Berthe <mikael@lilotux.net>
parents: 1074
diff changeset
712 guint get_max_history_blocks(void)
5be2408a6534 Add option "max_history_blocks"
Mikael Berthe <mikael@lilotux.net>
parents: 1074
diff changeset
713 {
5be2408a6534 Add option "max_history_blocks"
Mikael Berthe <mikael@lilotux.net>
parents: 1074
diff changeset
714 int max_num_of_blocks = settings_opt_get_int("max_history_blocks");
5be2408a6534 Add option "max_history_blocks"
Mikael Berthe <mikael@lilotux.net>
parents: 1074
diff changeset
715 if (max_num_of_blocks < 0)
5be2408a6534 Add option "max_history_blocks"
Mikael Berthe <mikael@lilotux.net>
parents: 1074
diff changeset
716 max_num_of_blocks = 0;
5be2408a6534 Add option "max_history_blocks"
Mikael Berthe <mikael@lilotux.net>
parents: 1074
diff changeset
717 else if (max_num_of_blocks == 1)
5be2408a6534 Add option "max_history_blocks"
Mikael Berthe <mikael@lilotux.net>
parents: 1074
diff changeset
718 max_num_of_blocks = 2;
5be2408a6534 Add option "max_history_blocks"
Mikael Berthe <mikael@lilotux.net>
parents: 1074
diff changeset
719 return (guint)max_num_of_blocks;
5be2408a6534 Add option "max_history_blocks"
Mikael Berthe <mikael@lilotux.net>
parents: 1074
diff changeset
720 }
5be2408a6534 Add option "max_history_blocks"
Mikael Berthe <mikael@lilotux.net>
parents: 1074
diff changeset
721
1811
e6d355e50d7a Update Vim modelines
Mikael Berthe <mikael@lilotux.net>
parents: 1794
diff changeset
722 /* vim: set et cindent cinoptions=>2\:2(0 ts=2 sw=2: For Vim users... */