X-Git-Url: https://www.tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=lib%2Fpidfile.c;h=6e24d5f026b7db98a1196a7e26696d5242cd890a;hp=54a6b4c16d6ccb7444ff6dc6bb357d90f2abaa96;hb=6d08eb1614b59d5f86a43edda9db06fca72b76cd;hpb=56bd0864e4c5680fee59af48228b1ec3fb97b57b diff --git a/lib/pidfile.c b/lib/pidfile.c index 54a6b4c1..6e24d5f0 100644 --- a/lib/pidfile.c +++ b/lib/pidfile.c @@ -14,9 +14,9 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA + You should have received a copy of the GNU General Public License along + with this program; if not, write to the Free Software Foundation, Inc., + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ /* left unaltered for tinc -- Ivo Timmermans */ @@ -25,30 +25,26 @@ * First version (v0.2) released */ -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include "system.h" +#include "pidfile.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. */ -int read_pid (char *pidfile) +pid_t read_pid (const char *pidfile) { FILE *f; - int pid; + long pid; if (!(f=fopen(pidfile,"r"))) return 0; - fscanf(f,"%d", &pid); + if(fscanf(f,"%20ld", &pid) != 1) + pid = 0; fclose(f); return pid; } @@ -57,11 +53,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 - * so 1 is returned, otherwise 0. + * so the pid is returned, otherwise 0. */ -int check_pid (char *pidfile) +pid_t check_pid (const char *pidfile) { - int pid = read_pid(pidfile); + pid_t pid = read_pid(pidfile); /* Amazing ! _I_ am already holding the pid file... */ if ((!pid) || (pid == getpid ())) @@ -73,8 +69,9 @@ int check_pid (char *pidfile) * be found -- GW */ /* But... errno is usually changed only on error.. */ + errno = 0; if (kill(pid, 0) && errno == ESRCH) - return(0); + return 0; return pid; } @@ -84,43 +81,42 @@ int check_pid (char *pidfile) * Writes the pid to the specified file. If that fails 0 is * returned, otherwise the pid. */ -int write_pid (char *pidfile) +pid_t write_pid (const char *pidfile) { FILE *f; int fd; - int pid; + pid_t pid; + + if ((fd = open(pidfile, O_RDWR|O_CREAT, 0644)) == -1) { + return 0; + } - 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 ((f = fdopen(fd, "r+")) == NULL) { + close(fd); return 0; } #ifdef HAVE_FLOCK if (flock(fd, LOCK_EX|LOCK_NB) == -1) { - fscanf(f, "%d", &pid); fclose(f); - printf("Can't lock, lock is held by pid %d.\n", pid); return 0; } #endif 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); #ifdef HAVE_FLOCK if (flock(fd, LOCK_UN) == -1) { - printf("Can't unlock pidfile %s, %s.\n", pidfile, strerror(errno)); - close(fd); + fclose(f); return 0; } #endif - close(fd); + fclose(f); return pid; } @@ -130,8 +126,8 @@ int write_pid (char *pidfile) * Remove the the specified file. The result from unlink(2) * is returned */ -int remove_pid (char *pidfile) +int remove_pid (const char *pidfile) { return unlink (pidfile); } - +#endif