From 06afc729f9061c1cfa14c78728d61d518324c2f0 Mon Sep 17 00:00:00 2001
From: Samo Penic <samo.penic@gmail.com>
Date: Wed, 04 May 2022 05:46:43 +0000
Subject: [PATCH] Moved all global variables to separate file and defined extern keyword where appropriate
---
src/general.c | 20 ++++++++++++--------
1 files changed, 12 insertions(+), 8 deletions(-)
diff --git a/src/general.c b/src/general.c
index 68b0611..1d72323 100644
--- a/src/general.c
+++ b/src/general.c
@@ -12,7 +12,7 @@
#include <fcntl.h>
#include <errno.h>
#include <string.h>
-
+#include "globals.h"
ts_uint ts_fprintf(FILE *fd, char *fmt, ...){
if(quiet) return TS_SUCCESS;
va_list ap;
@@ -61,7 +61,7 @@
fd = open(pidFile, O_RDWR | O_CREAT, S_IRUSR | S_IWUSR);
if (fd == -1){
ts_fprintf(stderr,"Could not open PID file %s", pidFile);
- fatal("Cannot continue",1);
+ fatal("Cannot continue (1)",1);
}
if (flags & CPF_CLOEXEC) {
@@ -75,13 +75,13 @@
flags = fcntl(fd, F_GETFD); /* Fetch flags */
if (flags == -1){
ts_fprintf(stderr,"Could not get flags for PID file %s", pidFile);
- fatal("Cannot continue",1);
+ fatal("Cannot continue (2)",1);
}
flags |= FD_CLOEXEC; /* Turn on FD_CLOEXEC */
if (fcntl(fd, F_SETFD, flags) == -1) /* Update flags */
ts_fprintf(stderr,"Could not set flags for PID file %s", pidFile);
- fatal("Cannot continue",1);
+ fatal("Cannot continue (3)",1);
}
@@ -89,24 +89,24 @@
if (errno == EAGAIN || errno == EACCES){
ts_fprintf(stderr,"PID file '%s' is locked; probably "
"'%s' is already running", pidFile, progName);
- fatal("Cannot continue",1);
+ fatal("Cannot continue (4)",1);
}
else{
ts_fprintf(stderr,"Unable to lock PID file '%s'", pidFile);
- fatal("Cannot continue",1);
+ fatal("Cannot continue (5)",1);
}
}
if (ftruncate(fd, 0) == -1){
ts_fprintf(stderr,"Could not truncate PID file '%s'", pidFile);
- fatal("Cannot continue",1);
+ fatal("Cannot continue (6)",1);
}
snprintf(buf, BUF_SIZE, "%ld\n", (long) getpid());
if (write(fd, buf, strlen(buf)) != strlen(buf)){
ts_fprintf(stderr,"Writing to PID file '%s'", pidFile);
- fatal("Cannot continue",1);
+ fatal("Cannot continue (7)",1);
}
return fd;
}
@@ -135,3 +135,7 @@
return lockReg(fd, F_SETLK, type, whence, start, len);
}
+
+char *libVersion(){
+ return TS_VERSION;
+}
--
Gitblit v1.9.3