fyb/calcurse-edge
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ignore the lock file if the pointed process is dead.

Browse Source 
Lukas: Small formatting and logic changes.

Signed-off-by: Lukas Fleischer <calcurse@cryptocrack.de>
This commit is contained in:
Erik Saule 2011-03-20 17:19:40 -04:00 committed by Lukas Fleischer
parent def487d741
commit 6ff9523876
1 changed files with 24 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/io.c
View File

@ -38,6 +38,7 @@
#include <string.h> #include <string.h>
#include <sys/stat.h> #include <sys/stat.h>
#include <sys/types.h> #include <sys/types.h>
#include <signal.h>
#include <time.h> #include <time.h>
#include <math.h> #include <math.h>
#include <unistd.h> #include <unistd.h>
@ -2948,19 +2949,34 @@ io_stop_psave_thread (void)
/* /*
* This sets a lock file to prevent from having two different instances of * This sets a lock file to prevent from having two different instances of
* calcurse running. * calcurse running.
* If the lock cannot be obtained, then warn the user and exit calcurse.
* Else, create a .calcurse.lock file in the user defined directory, which
* will be removed when calcurse exits.
* *
* Note: when creating the lock file, the interactive mode is not initialized * If the lock cannot be obtained, then warn the user and exit calcurse. Else,
* create a .calcurse.pid file in the user defined directory, which will be
* removed when calcurse exits.
*
* Note: When creating the lock file, the interactive mode is not initialized
* yet. * yet.
*/ */
void void
io_set_lock (void) io_set_lock (void)
{ {
FILE *lock; FILE *lock = fopen (path_cpid, "r");
int pid;
if ((lock = fopen (path_cpid, "r")) != NULL) if (lock != NULL)
{
/* If there is a lock file, check whether the process exists. */
if (fscanf(lock, "%d", &pid) == 1)
{
fclose(lock);
if (kill(pid, 0) != 0 && errno == ESRCH)
lock = NULL;
}
else
fclose(lock);
}
if (lock != NULL)
{ {
(void)fprintf (stderr, (void)fprintf (stderr,
_("\nWARNING: it seems that another calcurse instance is " _("\nWARNING: it seems that another calcurse instance is "
@ -2979,8 +2995,8 @@ io_set_lock (void)
} }
/* /*
* Create a new file and write the process pid inside * Create a new file and write the process pid inside (used to create a simple
* (used to create a simple lock for example). * lock for example). Overwrite already existing files.
*/ */
unsigned unsigned
io_dump_pid (char *file) io_dump_pid (char *file)