exa/codecrypt
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

keyring: better open/close behavior

Browse source
This commit is contained in:
Mirek Kratochvil 2013-09-12 12:18:17 +02:00
parent 54e45bd3d4
commit 329953d575
1 changed files with 6 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/keyring.cpp
View file

@ -419,6 +419,7 @@ bool keyring::open()
if (flock (lockfd, LOCK_EX) ) { if (flock (lockfd, LOCK_EX) ) {
::close (lockfd); ::close (lockfd);
lockfd = -1;
return false; return false;
} }
@ -462,10 +463,15 @@ bool keyring::close()
* Note that unlink goes first, so that the lock disappears atomically. * Note that unlink goes first, so that the lock disappears atomically.
*/ */
if (lockfd < 0) return true; //nothing to close
std::string fn = get_user_dir() + LOCK_FILENAME; std::string fn = get_user_dir() + LOCK_FILENAME;
unlink (fn.c_str() ); unlink (fn.c_str() );
flock (lockfd, LOCK_UN); flock (lockfd, LOCK_UN);
::close (lockfd); ::close (lockfd);
lockfd = -1;
return true; return true;
} }