diff options
| author | Vsevolod Stakhov <vsevolod@rambler-co.ru> | 2010-05-31 17:17:13 +0400 |
|---|---|---|
| committer | Vsevolod Stakhov <vsevolod@rambler-co.ru> | 2010-05-31 17:17:13 +0400 |
| commit | 0612e84b3cec508c3d62d38c4e2682c85cc808bb (patch) | |
| tree | db777e38f9c528127e195ad01da6a3088dc6da4a /src/cfg_xml.c | |
| parent | ae3eb4dfd787052bebc732c3e37b56f0800e1aa2 (diff) | |
| download | rspamd-0612e84b3cec508c3d62d38c4e2682c85cc808bb.tar.gz rspamd-0612e84b3cec508c3d62d38c4e2682c85cc808bb.zip | |
* Fix strict aliasing while compiling with optimization
* Fix tanhl detection for platforms that have not implementation of it
* Remove several compile warnings
Diffstat (limited to 'src/cfg_xml.c')
| -rw-r--r-- | src/cfg_xml.c | 17 |
1 files changed, 12 insertions, 5 deletions
diff --git a/src/cfg_xml.c b/src/cfg_xml.c index 18314106b..f8b3f55ba 100644 --- a/src/cfg_xml.c +++ b/src/cfg_xml.c @@ -744,11 +744,12 @@ handle_lua (struct config_file *cfg, struct rspamd_xml_userdata *ctx, GHashTable lua_file = basename (tmp2); if (lua_dir && lua_file) { cur_dir = g_malloc (PATH_MAX); - getcwd (cur_dir, PATH_MAX); - if (chdir (lua_dir) != -1) { + if (getcwd (cur_dir, PATH_MAX) != NULL && chdir (lua_dir) != -1) { if (luaL_dofile (L, lua_file) != 0) { msg_err ("cannot load lua file %s: %s", val, lua_tostring (L, -1)); - chdir (cur_dir); + if (chdir (cur_dir) == -1) { + msg_err ("cannot chdir to %s: %s", cur_dir, strerror (errno));; + } g_free (cur_dir); g_free (tmp1); g_free (tmp2); @@ -757,14 +758,18 @@ handle_lua (struct config_file *cfg, struct rspamd_xml_userdata *ctx, GHashTable } else { msg_err ("cannot chdir to %s: %s", lua_dir, strerror (errno));; - chdir (cur_dir); + if (chdir (cur_dir) == -1) { + msg_err ("cannot chdir to %s: %s", cur_dir, strerror (errno));; + } g_free (cur_dir); g_free (tmp1); g_free (tmp2); return FALSE; } - chdir (cur_dir); + if (chdir (cur_dir) == -1) { + msg_err ("cannot chdir to %s: %s", cur_dir, strerror (errno));; + } g_free (cur_dir); g_free (tmp1); g_free (tmp2); @@ -814,9 +819,11 @@ handle_module_path (struct config_file *cfg, struct rspamd_xml_userdata *ctx, GH cfg->script_modules = g_list_prepend (cfg->script_modules, cur); } globfree (&globbuf); + g_free (pattern); } else { msg_err ("glob failed: %s", strerror (errno)); + g_free (pattern); return FALSE; } } |