summaryrefslogtreecommitdiffstats
path: root/src/daemon
diff options
context:
space:
mode:
authorDenys Vlasenko <dvlasenk@redhat.com>2011-04-20 14:01:32 +0200
committerDenys Vlasenko <dvlasenk@redhat.com>2011-04-20 14:01:32 +0200
commit1ab41dec5fcc9d9411a7d318523f647ded40b37e (patch)
treebd751576fc9b8ca24015ecb5d8c36c9bcbb0644f /src/daemon
parent6d996b72d7e047aab392ec5a52df82bf85845c05 (diff)
downloadabrt-1ab41dec5fcc9d9411a7d318523f647ded40b37e.zip
abrt-1ab41dec5fcc9d9411a7d318523f647ded40b37e.tar.gz
abrt-1ab41dec5fcc9d9411a7d318523f647ded40b37e.tar.xz
rename Daemon.cpp to abrtd.c
This loses libstdc++, libm and libgcc_s libraries from abrtd Signed-off-by: Denys Vlasenko <dvlasenk@redhat.com>
Diffstat (limited to 'src/daemon')
-rw-r--r--src/daemon/CommLayerServerDBus.c2
-rw-r--r--src/daemon/Makefile.am6
-rw-r--r--src/daemon/MiddleWare.c2
-rw-r--r--src/daemon/Settings.cpp167
-rw-r--r--src/daemon/Settings.h43
-rw-r--r--src/daemon/abrt-action-save-package-data.c2
-rw-r--r--src/daemon/abrtd.c (renamed from src/daemon/Daemon.cpp)2
7 files changed, 7 insertions, 217 deletions
diff --git a/src/daemon/CommLayerServerDBus.c b/src/daemon/CommLayerServerDBus.c
index 9d6b6a1..dd03d98 100644
--- a/src/daemon/CommLayerServerDBus.c
+++ b/src/daemon/CommLayerServerDBus.c
@@ -21,7 +21,7 @@
#include "abrt_dbus.h"
#include "comm_layer_inner.h"
#include "MiddleWare.h"
-#include "Settings.h"
+#include "abrt_conf.h"
#include "CommLayerServerDBus.h"
/*
diff --git a/src/daemon/Makefile.am b/src/daemon/Makefile.am
index 97e6fb5..f57f85f 100644
--- a/src/daemon/Makefile.am
+++ b/src/daemon/Makefile.am
@@ -12,9 +12,9 @@ sbin_PROGRAMS = \
abrtd_SOURCES = \
MiddleWare.h MiddleWare.c \
CommLayerServerDBus.h CommLayerServerDBus.c \
- Settings.h Settings.cpp \
+ abrt_conf.h abrt_conf.c \
comm_layer_inner.h comm_layer_inner.c \
- Daemon.cpp
+ abrtd.c
abrtd_CPPFLAGS = \
-I$(srcdir)/../include/report -I$(srcdir)/../include \
-I$(srcdir)/../lib \
@@ -75,7 +75,7 @@ abrt_handle_crashdump_LDADD = \
abrt_action_save_package_data_SOURCES = \
rpm.h rpm.c \
- Settings.h Settings.cpp \
+ abrt_conf.h abrt_conf.c \
abrt-action-save-package-data.c
abrt_action_save_package_data_CPPFLAGS = \
-I$(srcdir)/../include/report -I$(srcdir)/../include \
diff --git a/src/daemon/MiddleWare.c b/src/daemon/MiddleWare.c
index cff5d78..d337668 100644
--- a/src/daemon/MiddleWare.c
+++ b/src/daemon/MiddleWare.c
@@ -19,7 +19,7 @@
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
#include "abrtlib.h"
-#include "Settings.h"
+#include "abrt_conf.h"
#include "comm_layer_inner.h"
#include "CommLayerServerDBus.h"
#include "MiddleWare.h"
diff --git a/src/daemon/Settings.cpp b/src/daemon/Settings.cpp
deleted file mode 100644
index 90efd19..0000000
--- a/src/daemon/Settings.cpp
+++ /dev/null
@@ -1,167 +0,0 @@
-/*
- Copyright (C) 2010 ABRT team
- Copyright (C) 2010 RedHat Inc
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License along
- with this program; if not, write to the Free Software Foundation, Inc.,
- 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-*/
-#include "abrtlib.h"
-#include "Settings.h"
-
-bool g_settings_bOpenGPGCheck = false;
-GList * g_settings_setOpenGPGPublicKeys = NULL;
-GList * g_settings_setBlackListedPkgs = NULL;
-GList * g_settings_setBlackListedPaths = NULL;
-char * g_settings_sWatchCrashdumpArchiveDir = NULL;
-unsigned int g_settings_nMaxCrashReportsSize = 1000;
-bool g_settings_bProcessUnpackaged = false;
-
-
-void free_settings()
-{
- list_free_with_free(g_settings_setOpenGPGPublicKeys);
- g_settings_setOpenGPGPublicKeys = NULL;
-
- list_free_with_free(g_settings_setBlackListedPkgs);
- g_settings_setBlackListedPkgs = NULL;
-
- list_free_with_free(g_settings_setBlackListedPaths);
- g_settings_setBlackListedPaths = NULL;
-
- free(g_settings_sWatchCrashdumpArchiveDir);
- g_settings_sWatchCrashdumpArchiveDir = NULL;
-}
-
-static GList *parse_list(const char* list)
-{
- struct strbuf *item = strbuf_new();
- GList *l = NULL;
-
- char *trim_item = NULL;
-
- for (unsigned ii = 0; list[ii]; ii++)
- {
- if (list[ii] == ',')
- {
- trim_item = strtrim(item->buf);
- l = g_list_append(l, xstrdup(trim_item));
- strbuf_clear(item);
- }
- else
- strbuf_append_char(item, list[ii]);
- }
-
- if (item->len > 0)
- {
- trim_item = strtrim(item->buf);
- l = g_list_append(l, xstrdup(trim_item));
- }
-
- strbuf_free(item);
-
- return l;
-}
-
-static void ParseCommon(map_string_h *settings, const char *conf_filename)
-{
- char *value;
-
- value = g_hash_table_lookup(settings, "OpenGPGCheck");
- if (value)
- {
- g_settings_bOpenGPGCheck = string_to_bool(value);
- g_hash_table_remove(settings, "OpenGPGCheck");
- }
-
- value = g_hash_table_lookup(settings, "BlackList");
- if (value)
- {
- g_settings_setBlackListedPkgs = parse_list(value);
- g_hash_table_remove(settings, "BlackList");
- }
-
- value = g_hash_table_lookup(settings, "BlackListedPaths");
- if (value)
- {
- g_settings_setBlackListedPaths = parse_list(value);
- g_hash_table_remove(settings, "BlackListedPaths");
- }
-
- value = g_hash_table_lookup(settings, "WatchCrashdumpArchiveDir");
- if (value)
- {
- g_settings_sWatchCrashdumpArchiveDir = xstrdup(value);
- g_hash_table_remove(settings, "WatchCrashdumpArchiveDir");
- }
-
- value = g_hash_table_lookup(settings, "MaxCrashReportsSize");
- if (value)
- {
-//fixme: dont die
- g_settings_nMaxCrashReportsSize = xatoi_positive(value);
- g_hash_table_remove(settings, "MaxCrashReportsSize");
- }
-
- value = g_hash_table_lookup(settings, "ProcessUnpackaged");
- if (value)
- {
- g_settings_bProcessUnpackaged = string_to_bool(value);
- g_hash_table_remove(settings, "ProcessUnpackaged");
- }
-
- GHashTableIter iter;
- char *name;
- /*char *value; - already declared */
- g_hash_table_iter_init(&iter, settings);
- while (g_hash_table_iter_next(&iter, (void**)&name, (void**)&value))
- {
- error_msg("Unrecognized variable '%s' in '%s'", name, conf_filename);
- }
-}
-
-static void LoadGPGKeys()
-{
- FILE *fp = fopen(CONF_DIR"/gpg_keys", "r");
- if (fp)
- {
- /* every line is one key
- * FIXME: make it more robust, it doesn't handle comments
- */
- char *line;
- while ((line = xmalloc_fgetline(fp)) != NULL)
- {
- if (line[0] == '/') // probably the beginning of a path, so let's handle it as a key
- g_settings_setOpenGPGPublicKeys = g_list_append(g_settings_setOpenGPGPublicKeys, line);
- else
- free(line);
- }
- fclose(fp);
- }
-}
-
-int load_settings()
-{
- free_settings();
-
- map_string_h *settings = new_map_string();
- if (!load_conf_file(CONF_DIR"/abrt.conf", settings, /*skip key w/o values:*/ false))
- error_msg("Can't open '%s'", CONF_DIR"/abrt.conf");
-
- ParseCommon(settings, CONF_DIR"/abrt.conf");
- free_map_string(settings);
-
- LoadGPGKeys();
-
- return 0;
-}
diff --git a/src/daemon/Settings.h b/src/daemon/Settings.h
deleted file mode 100644
index c01f8c4..0000000
--- a/src/daemon/Settings.h
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- Copyright (C) 2010 ABRT team
- Copyright (C) 2010 RedHat Inc
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License along
- with this program; if not, write to the Free Software Foundation, Inc.,
- 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-*/
-#ifndef SETTINGS_H_
-#define SETTINGS_H_
-
-#include "abrt_types.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-extern GList * g_settings_setOpenGPGPublicKeys;
-extern GList * g_settings_setBlackListedPkgs;
-extern GList * g_settings_setBlackListedPaths;
-extern unsigned int g_settings_nMaxCrashReportsSize;
-extern bool g_settings_bOpenGPGCheck;
-extern bool g_settings_bProcessUnpackaged;
-extern char * g_settings_sWatchCrashdumpArchiveDir;
-
-int load_settings();
-void free_settings();
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
diff --git a/src/daemon/abrt-action-save-package-data.c b/src/daemon/abrt-action-save-package-data.c
index 7249551..90b16ee 100644
--- a/src/daemon/abrt-action-save-package-data.c
+++ b/src/daemon/abrt-action-save-package-data.c
@@ -18,7 +18,7 @@
*/
#include <fnmatch.h>
#include "abrtlib.h"
-#include "Settings.h"
+#include "abrt_conf.h"
#include "rpm.h"
#include "parse_options.h"
diff --git a/src/daemon/Daemon.cpp b/src/daemon/abrtd.c
index 6b894f0..efc8d05 100644
--- a/src/daemon/Daemon.cpp
+++ b/src/daemon/abrtd.c
@@ -25,7 +25,7 @@
#include <sys/ioctl.h> /* ioctl(FIONREAD) */
#include "abrtlib.h"
#include "comm_layer_inner.h"
-#include "Settings.h"
+#include "abrt_conf.h"
#include "CommLayerServerDBus.h"
#include "MiddleWare.h"
#include "parse_options.h"