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

* edit/editlock.c: Fix for savannah bug #13673.

Browse Source 
(lock_build_symlink_name): New function.
(edit_lock_file): Use lock_build_symlink_name().
(edit_unlock_file): Likewise.
This commit is contained in:
Pavel Tsekov 2006-03-15 16:08:28 +00:00
parent fcc6f9bbea
commit 03e7a434b4
2 changed files with 32 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
edit/ChangeLog
View File

@ -1,3 +1,10 @@
2006-03-15 Pavel Tsekov <ptsekov@gmx.net>
* editlock.c: Fix for savannah bug #13673.
(lock_build_symlink_name): New function.
(edit_lock_file): Use lock_build_symlink_name().
(edit_unlock_file): Likewise.
2006-03-15 Pavel Tsekov <ptsekov@gmx.net>
* editcmd.c (edit_new_cmd): Remove redundant call to

28
edit/editlock.c
View File

@ -84,6 +84,24 @@ lock_build_name (void)
return g_strdup_printf ("%s@%s.%d", user, host, (int) getpid ());
}
static char *
lock_build_symlink_name (const char *fname)
{
char *fname_copy, *symlink_name;
char absolute_fname[PATH_MAX];
if (mc_realpath (fname, absolute_fname) == NULL)
return NULL;
fname = x_basename (absolute_fname);
fname_copy = g_strdup (fname);
absolute_fname[fname - absolute_fname] = '\0';
symlink_name = g_strconcat (absolute_fname, ".#", fname_copy, (char *) NULL);
g_free (fname_copy);
return symlink_name;
}
/* Extract pid from user@host.domain.pid string */
static struct lock_s *
lock_extract_info (const char *str)
@ -149,7 +167,9 @@ edit_lock_file (const char *fname)
return 0;
/* Check if already locked */
lockfname = g_strconcat (".#", fname, (char *) NULL);
lockfname = lock_build_symlink_name (fname);
if (lockfname == NULL)
return 0;
if (lstat (lockfname, &statbuf) == 0) {
lock = lock_get_info (lockfname);
if (!lock) {
@ -164,7 +184,7 @@ edit_lock_file (const char *fname)
msg =
g_strdup_printf (_
("File \"%s\" is already being edited\n"
"User: %s\nProcess ID: %d"), fname,
"User: %s\nProcess ID: %d"), x_basename (lockfname) + 2,
lockinfo->who, (int) lockinfo->pid);
/* TODO: Implement "Abort" - needs to rewind undo stack */
switch (edit_query_dialog2
@ -208,7 +228,9 @@ edit_unlock_file (const char *fname)
if (!fname || !*fname)
return 0;
lockfname = g_strconcat (".#", fname, (char *) NULL);
lockfname = lock_build_symlink_name (fname);
if (lockfname == NULL)
return 0;
/* Check if lock exists */
if (lstat (lockfname, &statbuf) == -1) {