diff options
author | Denys Vlasenko <dvlasenk@redhat.com> | 2011-05-04 14:39:37 +0200 |
---|---|---|
committer | Denys Vlasenko <dvlasenk@redhat.com> | 2011-05-04 14:39:37 +0200 |
commit | 58e7efce3d5ac71e308e7e44176473cd66e8ad26 (patch) | |
tree | d4822587940487f2910e925990a55377e60e05bd /src/daemon/abrt-server.c | |
parent | 27e7d86db7c6c96e8da75e8e8dda6359b9e73c41 (diff) | |
download | abrt-58e7efce3d5ac71e308e7e44176473cd66e8ad26.tar.gz abrt-58e7efce3d5ac71e308e7e44176473cd66e8ad26.tar.xz abrt-58e7efce3d5ac71e308e7e44176473cd66e8ad26.zip |
move $ABRT_foo checking and setting into helper routines.
I'm sick of fixing incorrect PROGNAME defines.
Now g_progname is a variable and it is set from argv[0].
Signed-off-by: Denys Vlasenko <dvlasenk@redhat.com>
Diffstat (limited to 'src/daemon/abrt-server.c')
-rw-r--r-- | src/daemon/abrt-server.c | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/src/daemon/abrt-server.c b/src/daemon/abrt-server.c index 53bb5fba..49b7e0ce 100644 --- a/src/daemon/abrt-server.c +++ b/src/daemon/abrt-server.c @@ -18,8 +18,6 @@ #include "abrtlib.h" #include "parse_options.h" -#define PROGNAME "abrt-server" - /* Maximal length of backtrace. */ #define MAX_BACKTRACE_SIZE (1024*1024) /* Amount of data received from one client for a message before reporting error. */ @@ -280,13 +278,11 @@ static void dummy_handler(int sig_unused) {} int main(int argc, char **argv) { - char *env_verbose = getenv("ABRT_VERBOSE"); - if (env_verbose) - g_verbose = atoi(env_verbose); + abrt_init(argv); /* Can't keep these strings/structs static: _() doesn't support that */ const char *program_usage_string = _( - PROGNAME" [options]" + "\b [options]" ); enum { OPT_v = 1 << 0, @@ -304,10 +300,9 @@ int main(int argc, char **argv) }; unsigned opts = parse_opts(argc, argv, program_options, program_usage_string); - putenv(xasprintf("ABRT_VERBOSE=%u", g_verbose)); - msg_prefix = xasprintf(PROGNAME"[%u]", getpid()); - if (opts & OPT_p) - putenv((char*)"ABRT_PROG_PREFIX=1"); + export_abrt_envvars(opts & OPT_p); + + msg_prefix = xasprintf("%s[%u]", g_progname, getpid()); if (opts & OPT_s) { openlog(msg_prefix, 0, LOG_DAEMON); |