projects
/
yaz-moved-to-github.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix install doc rule for Automake 1.11
[yaz-moved-to-github.git]
/
src
/
daemon.c
diff --git
a/src/daemon.c
b/src/daemon.c
index
f9d663a
..
e17994a
100644
(file)
--- a/
src/daemon.c
+++ b/
src/daemon.c
@@
-1,8
+1,6
@@
-/*
- * Copyright (C) 1995-2008, Index Data ApS
+/* This file is part of the YAZ toolkit.
+ * Copyright (C) 1995-2009 Index Data
* See the file LICENSE for details.
* See the file LICENSE for details.
- *
- * $Id: daemon.c,v 1.2 2008-02-21 10:15:30 adam Exp $
*/
/**
*/
/**
@@
-21,15
+19,12
@@
#include <unistd.h>
#endif
#include <stdlib.h>
#include <unistd.h>
#endif
#include <stdlib.h>
-#include <signal.h>
#if HAVE_SYS_WAIT_H
#include <sys/wait.h>
#endif
#if HAVE_SYS_WAIT_H
#include <sys/wait.h>
#endif
+#if HAVE_SYS_TYPES_H
#include <sys/types.h>
#include <sys/types.h>
-
-#if HAVE_SYS_STAT_H
-#include <sys/stat.h>
#endif
#include <fcntl.h>
#endif
#include <fcntl.h>
@@
-146,17
+141,17
@@
static void keepalive(void (*work)(void *data), void *data)
yaz_log(YLOG_WARN, "Received SIG %d from child %ld",
WTERMSIG(status), (long) p);
cont = 0;
yaz_log(YLOG_WARN, "Received SIG %d from child %ld",
WTERMSIG(status), (long) p);
cont = 0;
- }
- }
- else if (status == 0)
- cont = 0; /* child exited normally */
- else
- { /* child exited with error */
- yaz_log(YLOG_LOG, "Exit %d from child %ld", status, (long) p);
- cont = 0;
}
}
+ }
+ else if (status == 0)
+ cont = 0; /* child exited normally */
+ else
+ { /* child exited with error */
+ yaz_log(YLOG_LOG, "Exit %d from child %ld", status, (long) p);
+ cont = 0;
+ }
if (cont) /* respawn slower as we get more errors */
if (cont) /* respawn slower as we get more errors */
- sleep(1 + run/5);
+ sleep(1 + run/5);
run++;
}
}
run++;
}
}
@@
-248,7
+243,10
@@
int yaz_daemon(const char *progname,
close(1);
close(2);
open("/dev/null", O_RDWR);
close(1);
close(2);
open("/dev/null", O_RDWR);
- dup(0); dup(0);
+ if (dup(0) == -1)
+ return 1;
+ if (dup(0) == -1)
+ return 1;
close(hand[1]);
}
close(hand[1]);
}
@@
-272,7
+270,9
@@
int yaz_daemon(const char *progname,
/*
* Local variables:
* c-basic-offset: 4
/*
* Local variables:
* c-basic-offset: 4
+ * c-file-style: "Stroustrup"
* indent-tabs-mode: nil
* End:
* vim: shiftwidth=4 tabstop=8 expandtab
*/
* indent-tabs-mode: nil
* End:
* vim: shiftwidth=4 tabstop=8 expandtab
*/
+