(current_lock_owner): Allow for @ sign in username.

50624218 · Jason Rumney · ae59e888 · 50624218 · 50624218
Commit 50624218 authored Jul 23, 2007 by Jason Rumney
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 2 deletions

src/ChangeLog src/ChangeLog +4 -0

src/filelock.c src/filelock.c +2 -2

No files found.
--- a/src/ChangeLog
+++ b/src/ChangeLog
+2007-07-23  Jason Rumney  <jasonr@gnu.org>
+
+	* filelock.c (current_lock_owner): Allow for @ sign in username.
+
 2007-07-20  Eli Zaretskii  <eliz@gnu.org>

 	* makefile.w32-in (clean): Don't delete *~.

--- a/src/filelock.c
+++ b/src/filelock.c
@@ -468,8 +468,8 @@ current_lock_owner (owner, lfname)
    }

  /* Parse USER@HOST.PID:BOOT_TIME.  If can't parse, return -1.  */
-  /* The USER is everything before the first @.  */
-  at = index (lfinfo, '@');
+  /* The USER is everything before the last @.  */
+  at = rindex (lfinfo, '@');
  dot = rindex (lfinfo, '.');
  if (!at || !dot)
    {