Changeset 3fbce97 for conf.c

Timestamp:

2016-09-24T20:14:34Z (8 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Children:

ba52ac5

Parents:

63cad66 (diff), 82cb190 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' into parson

File:

• conf.c (modified) (7 diffs)

conf.c

@@ -37 +37 @@
 
 static int conf_loadini(conf_t *conf, char *file);
+static void conf_free(conf_t *conf);
 
 conf_t *conf_load(int argc, char *argv[])
@@ -73 +74 @@
         if (i == 0) {
                 fprintf(stderr, "Error: Syntax error in configuration file `%s'.\n", global.conf_file);
+                conf_free(conf);
                 return NULL;
         } else if (i == -1) {
@@ -104 +106 @@
                                 g_free(global.conf_file);
                                 global.conf_file = g_strdup(optarg);
-                                g_free(conf);
+                                conf_free(conf);
                                 /* Re-evaluate arguments. Don't use this option twice,
                                    you'll end up in an infinite loop! Hope this trick
@@ -135 +137 @@
                                "  -h  Show this help page.\n"
                                "  -V  Show version info.\n");
+                        conf_free(conf);
                         return NULL;
                 } else if (opt == 'V') {
-                        printf("BitlBee %s\nAPI version %06x\n",
-                               BITLBEE_VERSION, BITLBEE_VERSION_CODE);
+                        printf("BitlBee %s\nAPI version %06x\nConfigure args: %s\n",
+                               BITLBEE_VERSION, BITLBEE_VERSION_CODE, BITLBEE_CONFIGURE_ARGS);
+                        conf_free(conf);
                         return NULL;
                 } else if (opt == 'u') {
@@ -162 +166 @@
                    they're secure when in fact they're not. */
                 fprintf(stderr, "Error: Could not read CA file %s: %s\n", conf->cafile, strerror(errno));
+                conf_free(conf);
                 return NULL;
         }
 
         return conf;
+}
+
+static void conf_free(conf_t *conf)
+{
+        /* Free software means users have the four essential freedoms:
+           0. to run the program,
+           2. to study and change the program in source code form,
+           2. to redistribute exact copies, and
+           3. to distribute modified versions
+        */
+        g_free(conf->auth_pass);
+        g_free(conf->cafile);
+        g_free(conf->configdir);
+        g_free(conf->ft_listen);
+        g_free(conf->hostname);
+        g_free(conf->iface_in);
+        g_free(conf->iface_out);
+        g_free(conf->motdfile);
+        g_free(conf->oper_pass);
+        g_free(conf->pidfile);
+        g_free(conf->plugindir);
+        g_free(conf->port);
+        g_free(conf->primary_storage);
+        g_free(conf->user);
+        g_strfreev(conf->migrate_storage);
+        g_strfreev(conf->protocols);
+        g_free(conf);
+
 }
 
@@ -219 +252 @@
                                 g_free(conf->configdir);
                                 conf->configdir = g_strdup(ini->value);
+                        } else if (g_strcasecmp(ini->key, "plugindir") == 0) {
+                                g_free(conf->plugindir);
+                                conf->plugindir = g_strdup(ini->value);
                         } else if (g_strcasecmp(ini->key, "motdfile") == 0) {
                                 g_free(conf->motdfile);
@@ -259 +295 @@
                                 } else if (url->proto == PROTO_SOCKS5) {
                                         proxytype = PROXY_SOCKS5;
+                                } else if (url->proto == PROTO_SOCKS4A) {
+                                        proxytype = PROXY_SOCKS4A;
                                 }