Skip to content

fixup: sanitize true-false logic for "daemonize" #26

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
dmuhamedagic merged 1 commit into from
Apr 26, 2016
Merged

fixup: sanitize true-false logic for "daemonize" #26

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions src/main.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@

#define CLIENT_NALLOC 32

int daemonize = 0;
static int daemonize = 1;
int enable_stderr = 0;
timetype start_time;

Expand Down Expand Up @@ -1104,7 +1104,7 @@ static int read_arguments(int argc, char **argv)
enable_stderr = 1;
/* Fall through */
case 'S':
daemonize = 1;
daemonize = 0;
break;

case 'l':
Expand Down Expand Up @@ -1339,7 +1339,7 @@ static int do_status(int type)

fprintf(stdout, "booth_lockfile='%s' %s\n",
cl.lockfile, lockfile_data);
if (daemonize)
if (!daemonize)
fprintf(stderr, "Booth at %s port %d seems to be running.\n",
local->addr_string, booth_conf->port);
return 0;
Expand All @@ -1348,7 +1348,7 @@ static int do_status(int type)
quit:
log_debug("not running: %s", reason);
/* Ie. "DEBUG" */
if (daemonize)
if (!daemonize)
fprintf(stderr, "not running: %s\n", reason);
return ret;
}
Expand Down Expand Up @@ -1411,7 +1411,7 @@ static int do_server(int type)
exit(EXIT_FAILURE);
}

if (!daemonize) {
if (daemonize) {
if (daemon(0, 0) < 0) {
perror("daemon error");
exit(EXIT_FAILURE);
Expand Down