summaryrefslogtreecommitdiffabout
authorSergey Poznyakoff <gray@gnu.org.ua>2009-02-26 10:00:13 (GMT)
committer Sergey Poznyakoff <gray@gnu.org.ua>2009-02-26 10:00:13 (GMT)
commit3c4b1e89c855d7ee2f9bae810ad75de946fa8edc (patch) (side-by-side diff)
tree1a53233c4ec392fa65796a37ea3e4942796eb1f2
parent81640ab2b9ad954d4952aed43a70d7874da1c463 (diff)
downloadwydawca-3c4b1e89c855d7ee2f9bae810ad75de946fa8edc.tar.gz
wydawca-3c4b1e89c855d7ee2f9bae810ad75de946fa8edc.tar.bz2
Minor fixes
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--NEWS2
-rw-r--r--configure.ac2
-rw-r--r--src/pidfile.c3
-rw-r--r--src/wydawca.c14
4 files changed, 12 insertions, 9 deletions
diff --git a/NEWS b/NEWS
index 95b2433..7f62bfa 100644
--- a/NEWS
+++ b/NEWS
@@ -5,7 +5,7 @@ See the end of file for copying conditions.
Please send Wydawca bug reports to <bug-wydawca@gnu.org.ua>.
-Version 1.9.90 (Git)
+Version 1.9.91 (Git)
Version 1.2, 2009-01-22
diff --git a/configure.ac b/configure.ac
index 737e2dc..604ccc4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -15,7 +15,7 @@
# along with wydawca. If not, see <http://www.gnu.org/licenses/>.
AC_PREREQ(2.59)
-AC_INIT([wydawca], 1.9.90, [bug-wydawca@gnu.org.ua])
+AC_INIT([wydawca], 1.9.91, [bug-wydawca@gnu.org.ua])
AC_CONFIG_SRCDIR([src/wydawca.c])
AC_CONFIG_AUX_DIR([build-aux])
AC_CONFIG_HEADER([config.h])
diff --git a/src/pidfile.c b/src/pidfile.c
index afbcb87..4e178db 100644
--- a/src/pidfile.c
+++ b/src/pidfile.c
@@ -33,7 +33,7 @@ check_pidfile ()
if (fp)
{
- unsigned long pid;
+ unsigned long pid = -1;
if (fscanf (fp, "%lu\n", &pid) != 1)
{
logmsg (LOG_ERR, _("malformed pidfile %s"), pidfile);
@@ -84,7 +84,6 @@ check_pidfile ()
}
fprintf (fp, "%lu\n", (unsigned long) getpid ());
fclose (fp);
- atexit (remove_pidfile);
}
diff --git a/src/wydawca.c b/src/wydawca.c
index f02ac99..d210717 100644
--- a/src/wydawca.c
+++ b/src/wydawca.c
@@ -275,15 +275,19 @@ extern int reconfigure;
void
wydawca_daemon ()
{
- check_pidfile ();
-
- if (!foreground && daemon (0, 0))
+ if (!foreground)
{
- logmsg (LOG_ERR, "%s", strerror (errno));
- exit (EX_OSERR);
+ if (daemon (0, 0))
+ {
+ logmsg (LOG_ERR, "%s", strerror (errno));
+ exit (EX_OSERR);
+ }
+ logmsg (LOG_NOTICE, _("daemon launched"));
}
+ check_pidfile ();
wydawca_listener ();
+ remove_pidfile ();
}

Return to:

Send suggestions and report system problems to the System administrator.