mirrors/mc
1
0
Fork 0
mirror of https://github.com/MidnightCommander/mc synced 2025-01-09 13:02:01 +03:00
Code Issues Packages Projects Releases Wiki Activity

(unlock_file): eliminate goto, reduce variable scopes.

Browse Source 
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
This commit is contained in:
Andrew Borodin 2023-06-25 11:04:53 +03:00
parent fded68057e
commit 54ec89d950
1 changed files with 16 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
lib/lock.c
View File

@ -279,8 +279,7 @@ int
unlock_file (const vfs_path_t * fname_vpath) unlock_file (const vfs_path_t * fname_vpath)
{ {
char *lockfname; char *lockfname;
struct stat statbuf; const char *elpath;
const char *elpath, *lock;
if (fname_vpath == NULL) if (fname_vpath == NULL)
return 0; return 0;
@ -291,27 +290,24 @@ unlock_file (const vfs_path_t * fname_vpath)
return 0; return 0;
lockfname = lock_build_symlink_name (fname_vpath); lockfname = lock_build_symlink_name (fname_vpath);
if (lockfname != NULL)
if (lockfname == NULL) {
return 0; struct stat statbuf;
/* Check if lock exists */ /* Check if lock exists */
if (lstat (lockfname, &statbuf) == -1) if (lstat (lockfname, &statbuf) != -1)
goto ret; {
const char *lock;
lock = lock_get_info (lockfname); lock = lock_get_info (lockfname);
if (lock != NULL)
{
/* Don't touch if lock is not ours */ /* Don't touch if lock is not ours */
if (lock_extract_info (lock)->pid != getpid ()) if (lock == NULL || lock_extract_info (lock)->pid == getpid ())
goto ret; unlink (lockfname);
} }
/* Remove lock */
unlink (lockfname);
ret:
g_free (lockfname); g_free (lockfname);
}
return 0; return 0;
} }