projects
/
tinc
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Don't free struct addrinfo too early. Spotted by Christian Cier-Zniewski.
[tinc]
/
lib
/
pidfile.c
diff --git
a/lib/pidfile.c
b/lib/pidfile.c
index
2f30a4e
..
830d3f3
100644
(file)
--- a/
lib/pidfile.c
+++ b/
lib/pidfile.c
@@
-25,28
+25,23
@@
* First version (v0.2) released
*/
* First version (v0.2) released
*/
-#include <stdio.h>
-#include <unistd.h>
-#include <sys/stat.h>
-#include <sys/file.h>
-#include <string.h>
-#include <errno.h>
-#include <signal.h>
+#include "system.h"
+#ifndef HAVE_MINGW
/* read_pid
*
* Reads the specified pidfile and returns the read pid.
* 0 is returned if either there's no pidfile, it's empty
* or no pid can be read.
*/
/* read_pid
*
* Reads the specified pidfile and returns the read pid.
* 0 is returned if either there's no pidfile, it's empty
* or no pid can be read.
*/
-
in
t read_pid (char *pidfile)
+
pid_
t read_pid (char *pidfile)
{
FILE *f;
{
FILE *f;
-
int
pid;
+
long
pid;
if (!(f=fopen(pidfile,"r")))
return 0;
if (!(f=fopen(pidfile,"r")))
return 0;
- fscanf(f,"%d", &pid);
+ fscanf(f,"%
l
d", &pid);
fclose(f);
return pid;
}
fclose(f);
return pid;
}
@@
-55,11
+50,11
@@
int read_pid (char *pidfile)
*
* Reads the pid using read_pid and looks up the pid in the process
* table (using /proc) to determine if the process already exists. If
*
* Reads the pid using read_pid and looks up the pid in the process
* table (using /proc) to determine if the process already exists. If
- * so
1
is returned, otherwise 0.
+ * so
the pid
is returned, otherwise 0.
*/
*/
-
in
t check_pid (char *pidfile)
+
pid_
t check_pid (char *pidfile)
{
{
-
in
t pid = read_pid(pidfile);
+
pid_
t pid = read_pid(pidfile);
/* Amazing ! _I_ am already holding the pid file... */
if ((!pid) || (pid == getpid ()))
/* Amazing ! _I_ am already holding the pid file... */
if ((!pid) || (pid == getpid ()))
@@
-71,8
+66,9
@@
int check_pid (char *pidfile)
* be found -- GW
*/
/* But... errno is usually changed only on error.. */
* be found -- GW
*/
/* But... errno is usually changed only on error.. */
+ errno = 0;
if (kill(pid, 0) && errno == ESRCH)
if (kill(pid, 0) && errno == ESRCH)
- return
(0)
;
+ return
0
;
return pid;
}
return pid;
}
@@
-82,39
+78,42
@@
int check_pid (char *pidfile)
* Writes the pid to the specified file. If that fails 0 is
* returned, otherwise the pid.
*/
* Writes the pid to the specified file. If that fails 0 is
* returned, otherwise the pid.
*/
-
in
t write_pid (char *pidfile)
+
pid_
t write_pid (char *pidfile)
{
FILE *f;
int fd;
{
FILE *f;
int fd;
-
in
t pid;
+
pid_
t pid;
- if ( ((fd = open(pidfile, O_RDWR|O_CREAT, 0644)) == -1)
- || ((f = fdopen(fd, "r+")) == NULL) ) {
- fprintf(stderr, "Can't open or create %s.\n", pidfile);
+ if ((fd = open(pidfile, O_RDWR|O_CREAT, 0644)) == -1) {
return 0;
}
return 0;
}
+ if ((f = fdopen(fd, "r+")) == NULL) {
+ close(fd);
+ return 0;
+ }
+
+#ifdef HAVE_FLOCK
if (flock(fd, LOCK_EX|LOCK_NB) == -1) {
if (flock(fd, LOCK_EX|LOCK_NB) == -1) {
- fscanf(f, "%d", &pid);
fclose(f);
fclose(f);
- printf("Can't lock, lock is held by pid %d.\n", pid);
return 0;
}
return 0;
}
+#endif
pid = getpid();
pid = getpid();
- if (!fprintf(f,"%d\n", pid)) {
- printf("Can't write pid , %s.\n", strerror(errno));
- close(fd);
+ if (!fprintf(f,"%ld\n", (long)pid)) {
+ fclose(f);
return 0;
}
fflush(f);
return 0;
}
fflush(f);
+#ifdef HAVE_FLOCK
if (flock(fd, LOCK_UN) == -1) {
if (flock(fd, LOCK_UN) == -1) {
- printf("Can't unlock pidfile %s, %s.\n", pidfile, strerror(errno));
- close(fd);
+ fclose(f);
return 0;
}
return 0;
}
- close(fd);
+#endif
+ fclose(f);
return pid;
}
return pid;
}
@@
-128,4
+127,4
@@
int remove_pid (char *pidfile)
{
return unlink (pidfile);
}
{
return unlink (pidfile);
}
-
+#endif