projects
/
apps
/
pfixtools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
No more black magic on init/exit calls.
[apps/pfixtools.git]
/
common
/
common.c
diff --git
a/common/common.c
b/common/common.c
index
af95efa
..
9fdf961
100644
(file)
--- a/
common/common.c
+++ b/
common/common.c
@@
-41,33
+41,22
@@
#include "common.h"
#include "common.h"
-sig_atomic_t sigint = false;
-sig_atomic_t sighup = false;
-
bool daemon_process = true;
int log_level = LOG_INFO;
bool daemon_process = true;
int log_level = LOG_INFO;
+bool log_syslog = false;
static FILE *pidfile = NULL;
void common_sighandler(int sig)
{
switch (sig) {
static FILE *pidfile = NULL;
void common_sighandler(int sig)
{
switch (sig) {
- case SIGTERM:
- case SIGINT:
- sigint = true;
- return;
-
- case SIGHUP:
- sighup = true;
- return;
-
default:
default:
-
err("Killed (got signal %d)...", sig);
+ err("Killed (got signal %d)...", sig);
exit(-1);
}
}
exit(-1);
}
}
-
static
int setnonblock(int sock)
+int setnonblock(int sock)
{
int res = fcntl(sock, F_GETFL);
{
int res = fcntl(sock, F_GETFL);
@@
-199,11
+188,11
@@
int daemon_detach(void)
pid = fork();
if (pid < 0) {
return -1;
pid = fork();
if (pid < 0) {
return -1;
-
}
+ }
if (pid) {
if (pid) {
-
daemon_process = false;
+ daemon_process = false;
exit(0);
exit(0);
-
}
+ }
setsid();
return 0;
setsid();
return 0;
@@
-236,20
+225,11
@@
int drop_privileges(const char *user, const char *group)
int pidfile_open(const char *name)
{
int pidfile_open(const char *name)
{
- struct flock lock;
- p_clear(&lock, 1);
- lock.l_type = F_WRLCK;
if (name) {
pidfile = fopen(name, "w");
if (!pidfile)
return -1;
if (name) {
pidfile = fopen(name, "w");
if (!pidfile)
return -1;
- if (fcntl(fileno(pidfile), F_SETLK, &lock) == -1) {
- crit("program already started");
- fclose(pidfile);
- pidfile = NULL;
- return -1;
- }
- fprintf(pidfile, "%d\n", getpid());
+ fprintf(pidfile, "%d\n", getpid());
return fflush(pidfile);
}
return 0;
return fflush(pidfile);
}
return 0;
@@
-268,14
+248,12
@@
int pidfile_refresh(void)
static void pidfile_close(void)
{
static void pidfile_close(void)
{
- struct flock lock;
- p_clear(&lock, 1);
- lock.l_type = F_UNLCK;
if (pidfile) {
if (pidfile) {
- rewind(pidfile);
- ftruncate(fileno(pidfile), 0);
- fcntl(fileno(pidfile), F_SETLK, &lock);
- fclose(pidfile);
+ if (daemon_process) {
+ rewind(pidfile);
+ ftruncate(fileno(pidfile), 0);
+ }
+ fclose(pidfile);
pidfile = NULL;
}
}
pidfile = NULL;
}
}
@@
-283,6
+261,11
@@
static void pidfile_close(void)
int common_setup(const char* pidfilename, bool unsafe, const char* runas_user,
const char* runas_group, bool daemonize)
{
int common_setup(const char* pidfilename, bool unsafe, const char* runas_user,
const char* runas_group, bool daemonize)
{
+ if (pidfile_open(pidfilename) < 0) {
+ crit("unable to write pidfile %s", pidfilename);
+ return EXIT_FAILURE;
+ }
+
if (!unsafe && drop_privileges(runas_user, runas_group) < 0) {
crit("unable to drop privileges");
return EXIT_FAILURE;
if (!unsafe && drop_privileges(runas_user, runas_group) < 0) {
crit("unable to drop privileges");
return EXIT_FAILURE;
@@
-293,41
+276,43
@@
int common_setup(const char* pidfilename, bool unsafe, const char* runas_user,
return EXIT_FAILURE;
}
return EXIT_FAILURE;
}
- if (pidfile_open(pidfilename) < 0) {
- crit("unable to write pidfile %s", pidfilename);
- return EXIT_FAILURE;
- }
-
pidfile_refresh();
return EXIT_SUCCESS;
}
pidfile_refresh();
return EXIT_SUCCESS;
}
-extern initcall_t __madinit[];
-extern exitcall_t __madexit[];
+#include "array.h"
+
+ARRAY(exitcall_t)
+
+static A(exitcall_t) __exit = ARRAY_INIT;
+
+void common_register_exit(exitcall_t _exit)
+{
+ array_add(__exit, _exit);
+}
static void common_shutdown(void)
{
static void common_shutdown(void)
{
-
if (daemon_process
) {
-
info("stopping...");
-
}
-
pidfile_close();
- for (int i =
-1; __madexit[i]; i--
) {
-
(*__madexit[i]
)();
+
if (daemon_process && log_syslog
) {
+ info("stopping...");
+ }
+ pidfile_close();
+ for (int i =
array_len(__exit) - 1 ; i >= 0 ; --i
) {
+
array_elt(__exit, i
)();
}
}
+ array_wipe(__exit);
}
}
-static void __attribute__((__constructor__,__used__))
-common_initialize(void)
+void common_init(void)
{
{
+ static bool __ran = false;
+ if (__ran) {
+ return;
+ }
if (atexit(common_shutdown)) {
fputs("Cannot hook my atexit function, quitting !\n", stderr);
abort();
}
if (atexit(common_shutdown)) {
fputs("Cannot hook my atexit function, quitting !\n", stderr);
abort();
}
-
- for (int i = 0; __madinit[i]; i++) {
- if ((*__madinit[i])()) {
- exit(EXIT_FAILURE);
- }
- }
+ __ran = true;
}
}