X-Git-Url: http://git.madism.org/?a=blobdiff_plain;f=common%2Fcommon.c;h=723e0f5b7006dc107fe538d70d44d6572283eabf;hb=6b977cdc115af3cebdf488f27d106788e8bd9461;hp=9fdf961a45c1a1bbb5ff13509318ff1094267726;hpb=785558696ffa16453be0b5b565c46b6426126d1e;p=apps%2Fpfixtools.git

diff --git a/common/common.c b/common/common.c
index 9fdf961..723e0f5 100644
--- a/common/common.c
+++ b/common/common.c
@@ -16,17 +16,20 @@
 /*     products derived from this software without specific prior written     */
 /*     permission.                                                            */
 /*                                                                            */
-/*  THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND   */
-/*  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE     */
-/*  IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR        */
-/*  PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS    */
-/*  BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR    */
-/*  CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF      */
-/*  SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS  */
-/*  INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN   */
-/*  CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)   */
-/*  ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF    */
-/*  THE POSSIBILITY OF SUCH DAMAGE.                                           */
+/*  THIS SOFTWARE IS PROVIDED BY THE CONTRIBUTORS ``AS IS'' AND ANY EXPRESS   */
+/*  OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED         */
+/*  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE    */
+/*  DISCLAIMED.  IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY         */
+/*  DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL        */
+/*  DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS   */
+/*  OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)     */
+/*  HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,       */
+/*  STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN  */
+/*  ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE           */
+/*  POSSIBILITY OF SUCH DAMAGE.                                               */
+/*                                                                            */
+/*   Copyright (c) 2006-2008 the Authors                                      */
+/*   see AUTHORS and source files for details                                 */
 /******************************************************************************/
 
 /*
@@ -41,9 +44,10 @@
 
 #include "common.h"
 
-bool daemon_process  = true;
-int  log_level       = LOG_INFO;
-bool log_syslog      = false;
+bool daemon_process   = true;
+int  log_level        = LOG_INFO;
+bool log_syslog       = false;
+const char *log_state = "";
 
 static FILE *pidfile = NULL;
 
@@ -286,15 +290,16 @@ ARRAY(exitcall_t)
 
 static A(exitcall_t) __exit = ARRAY_INIT;
 
-void common_register_exit(exitcall_t _exit)
+void common_register_exit(exitcall_t exitcall)
 {
-    array_add(__exit, _exit);
+    array_add(__exit, exitcall);
 }
 
 static void common_shutdown(void)
 {
+    log_state = "stopping ";
     if (daemon_process && log_syslog) {
-        info("stopping...");
+        info("");
     }
     pidfile_close();
     for (int i = array_len(__exit) - 1 ; i >= 0 ; --i) {
@@ -309,6 +314,7 @@ void common_init(void)
     if (__ran) {
         return;
     }
+    log_state = "starting ";
     if (atexit(common_shutdown)) {
         fputs("Cannot hook my atexit function, quitting !\n", stderr);
         abort();