From cfd8ede2b3c7248bd3b78e71ef17bdc9eb819aae Mon Sep 17 00:00:00 2001 From: Lukas Fleischer Date: Mon, 21 May 2012 10:13:05 +0200 Subject: Switch to Linux kernel coding style Convert our code base to adhere to Linux kernel coding style using Lindent, with the following exceptions: * Use spaces, instead of tabs, for indentation. * Use 2-character indentations (instead of 8 characters). Rationale: We currently have too much levels of indentation. Using 8-character tabs would make huge code parts unreadable. These need to be cleaned up before we can switch to 8 characters. Signed-off-by: Lukas Fleischer --- src/dmon.c | 179 ++++++++++++++++++++++++++++--------------------------------- 1 file changed, 82 insertions(+), 97 deletions(-) (limited to 'src/dmon.c') diff --git a/src/dmon.c b/src/dmon.c index 621cd0b..f8d3403 100644 --- a/src/dmon.c +++ b/src/dmon.c @@ -64,26 +64,22 @@ static unsigned data_loaded; -static void -dmon_sigs_hdlr (int sig) +static void dmon_sigs_hdlr(int sig) { if (data_loaded) - free_user_data (); + free_user_data(); - DMON_LOG (_("terminated at %s with signal %d\n"), nowstr (), sig); + DMON_LOG(_("terminated at %s with signal %d\n"), nowstr(), sig); - if (unlink (path_dpid) != 0) - { - DMON_LOG (_("Could not remove daemon lock file: %s\n"), - strerror (errno)); - exit (EXIT_FAILURE); - } + if (unlink(path_dpid) != 0) { + DMON_LOG(_("Could not remove daemon lock file: %s\n"), strerror(errno)); + exit(EXIT_FAILURE); + } - exit (EXIT_SUCCESS); + exit(EXIT_SUCCESS); } -static unsigned -daemonize (int status) +static unsigned daemonize(int status) { int fd; @@ -93,16 +89,15 @@ daemonize (int status) * First need to fork in order to become a child of the init process, * once the father exits. */ - switch (fork ()) - { - case -1: /* fork error */ - EXIT (_("Could not fork: %s\n"), strerror (errno)); - break; - case 0: /* child */ - break; - default: /* parent */ - exit (status); - } + switch (fork()) { + case -1: /* fork error */ + EXIT(_("Could not fork: %s\n"), strerror(errno)); + break; + case 0: /* child */ + break; + default: /* parent */ + exit(status); + } /* * Process independency. @@ -110,109 +105,99 @@ daemonize (int status) * Obtain a new process group and session in order to get detached from the * controlling terminal. */ - if (setsid () == -1) - { - DMON_LOG (_("Could not detach from the controlling terminal: %s\n"), - strerror (errno)); - return 0; - } + if (setsid() == -1) { + DMON_LOG(_("Could not detach from the controlling terminal: %s\n"), + strerror(errno)); + return 0; + } /* * Change working directory to root directory, * to prevent filesystem unmounts. */ - if (chdir ("/") == -1) - { - DMON_LOG (_("Could not change working directory: %s\n"), - strerror (errno)); - return 0; - } + if (chdir("/") == -1) { + DMON_LOG(_("Could not change working directory: %s\n"), strerror(errno)); + return 0; + } /* Redirect standard file descriptors to /dev/null. */ - if ((fd = open (_PATH_DEVNULL, O_RDWR, 0)) != -1) - { - dup2 (fd, STDIN_FILENO); - dup2 (fd, STDOUT_FILENO); - dup2 (fd, STDERR_FILENO); - if (fd > 2) - close (fd); - } + if ((fd = open(_PATH_DEVNULL, O_RDWR, 0)) != -1) { + dup2(fd, STDIN_FILENO); + dup2(fd, STDOUT_FILENO); + dup2(fd, STDERR_FILENO); + if (fd > 2) + close(fd); + } /* Write access for the owner only. */ - umask (0022); + umask(0022); - if (!sigs_set_hdlr (SIGINT, dmon_sigs_hdlr) - || !sigs_set_hdlr (SIGTERM, dmon_sigs_hdlr) - || !sigs_set_hdlr (SIGALRM, dmon_sigs_hdlr) - || !sigs_set_hdlr (SIGQUIT, dmon_sigs_hdlr) - || !sigs_set_hdlr (SIGCHLD, SIG_IGN)) + if (!sigs_set_hdlr(SIGINT, dmon_sigs_hdlr) + || !sigs_set_hdlr(SIGTERM, dmon_sigs_hdlr) + || !sigs_set_hdlr(SIGALRM, dmon_sigs_hdlr) + || !sigs_set_hdlr(SIGQUIT, dmon_sigs_hdlr) + || !sigs_set_hdlr(SIGCHLD, SIG_IGN)) return 0; return 1; } -void -dmon_start (int parent_exit_status) +void dmon_start(int parent_exit_status) { - if (!daemonize (parent_exit_status)) - DMON_ABRT (_("Cannot daemonize, aborting\n")); - - if (!io_dump_pid (path_dpid)) - DMON_ABRT (_("Could not set lock file\n")); - - if (!io_file_exist (path_conf)) - DMON_ABRT (_("Could not access \"%s\": %s\n"), - path_conf, strerror (errno)); - config_load (); - - if (!io_file_exist (path_apts)) - DMON_ABRT (_("Could not access \"%s\": %s\n"), - path_apts, strerror (errno)); - apoint_llist_init (); - recur_apoint_llist_init (); - event_llist_init (); - todo_init_list (); - io_load_app (); + if (!daemonize(parent_exit_status)) + DMON_ABRT(_("Cannot daemonize, aborting\n")); + + if (!io_dump_pid(path_dpid)) + DMON_ABRT(_("Could not set lock file\n")); + + if (!io_file_exist(path_conf)) + DMON_ABRT(_("Could not access \"%s\": %s\n"), path_conf, strerror(errno)); + config_load(); + + if (!io_file_exist(path_apts)) + DMON_ABRT(_("Could not access \"%s\": %s\n"), path_apts, strerror(errno)); + apoint_llist_init(); + recur_apoint_llist_init(); + event_llist_init(); + todo_init_list(); + io_load_app(); data_loaded = 1; - DMON_LOG (_("started at %s\n"), nowstr ()); - for (;;) - { - int left; - - if (!notify_get_next_bkgd ()) - DMON_ABRT (_("error loading next appointment\n")); - - left = notify_time_left (); - if (left > 0 && left < nbar.cntdwn && notify_needs_reminder ()) - { - DMON_LOG (_("launching notification at %s for: \"%s\"\n"), - nowstr (), notify_app_txt ()); - if (!notify_launch_cmd ()) - DMON_LOG (_("error while sending notification\n")); - } - - DMON_LOG (ngettext ("sleeping at %s for %d second\n", - "sleeping at %s for %d seconds\n", - DMON_SLEEP_TIME), nowstr (), DMON_SLEEP_TIME); - psleep (DMON_SLEEP_TIME); - DMON_LOG (_("awakened at %s\n"), nowstr ()); + DMON_LOG(_("started at %s\n"), nowstr()); + for (;;) { + int left; + + if (!notify_get_next_bkgd()) + DMON_ABRT(_("error loading next appointment\n")); + + left = notify_time_left(); + if (left > 0 && left < nbar.cntdwn && notify_needs_reminder()) { + DMON_LOG(_("launching notification at %s for: \"%s\"\n"), + nowstr(), notify_app_txt()); + if (!notify_launch_cmd()) + DMON_LOG(_("error while sending notification\n")); } + + DMON_LOG(ngettext("sleeping at %s for %d second\n", + "sleeping at %s for %d seconds\n", + DMON_SLEEP_TIME), nowstr(), DMON_SLEEP_TIME); + psleep(DMON_SLEEP_TIME); + DMON_LOG(_("awakened at %s\n"), nowstr()); + } } /* * Check if calcurse is running in background, and if yes, send a SIGINT * signal to stop it. */ -void -dmon_stop (void) +void dmon_stop(void) { int dpid; - dpid = io_get_pid (path_dpid); + dpid = io_get_pid(path_dpid); if (!dpid) return; - if (kill ((pid_t)dpid, SIGINT) < 0 && errno != ESRCH) - EXIT (_("Could not stop calcurse daemon: %s\n"), strerror (errno)); + if (kill((pid_t) dpid, SIGINT) < 0 && errno != ESRCH) + EXIT(_("Could not stop calcurse daemon: %s\n"), strerror(errno)); } -- cgit v1.2.3-54-g00ecf