default to foreground=FALSE even without config file

This commit is contained in:
marschap
2006-11-19 14:33:01 +00:00
parent c910fa2987
commit 9b7fa552a3
5 changed files with 38 additions and 28 deletions
+5 -5
View File
@@ -54,7 +54,7 @@ char *progname = "lcdexec";
char * configfile = NULL;
char * address = NULL;
int port = UNSET_INT;
int foreground_mode = UNSET_INT;
int foreground = FALSE;
static int report_level = UNSET_INT;
static int report_dest = UNSET_INT;
char *displayname = NULL;
@@ -97,7 +97,7 @@ int main(int argc, char **argv)
CHAIN(error, connect_and_setup());
CHAIN_END(error);
if(!foreground_mode) {
if(foreground != TRUE) {
if (daemon(1,1) != 0) {
report(RPT_ERR, "Error: daemonize failed");
}
@@ -138,7 +138,7 @@ int process_command_line(int argc, char **argv)
}
break;
case 'f':
foreground_mode = 1;
foreground = TRUE;
break;
case 'r':
temp_int = strtol(optarg, &end, 0);
@@ -200,8 +200,8 @@ int process_configfile(char *configfile)
? RPT_DEST_SYSLOG
: RPT_DEST_STDERR;
}
if (foreground_mode == UNSET_INT) {
foreground_mode = config_get_bool(progname, "Foreground", 0, 0);
if (foreground != TRUE) {
foreground = config_get_bool(progname, "Foreground", 0, FALSE);
}
if ((tmp = config_get_string(progname, "DisplayName", 0, NULL)) != NULL)
+11 -8
View File
@@ -1,22 +1,24 @@
/*
* lcdexec.c
* lcdexec/menu.h
* This file is part of lcdexec, an LCDproc client.
*
* This file is released under the GNU General Public License. Refer to the
* COPYING file distributed with this package.
*
* Copyright (c) 2002, Joris Robijn
* Copyright (c) 2006, Peter Marschall
*
*/
#include <stdio.h>
#include <unistd.h>
#include <string.h>
#ifndef LCDEXEC_MENU_H
#define LCDEXEC_MENU_H
#include "shared/str.h"
#include "shared/report.h"
#include "shared/configfile.h"
#include "shared/sockets.h"
#ifndef TRUE
# define TRUE 1
#endif
#ifndef FALSE
# define FALSE 0
#endif
typedef enum {
@@ -48,3 +50,4 @@ const char *menu_command(MenuEntry *me);
void menu_free(MenuEntry *me);
void menu_dump(MenuEntry *me);
#endif