XEmacs 21.2.20 "Yoko".

[chise/xemacs-chise.git.1] / src / filelock.c

diff --git a/src/filelock.c b/src/filelock.c
index 96ee76d..49bda9a 100644 (file)
--- a/src/filelock.c
+++ b/src/filelock.c
@@ -126,11 +126,11 @@ lock_file_1 (char *lfname,int force)
   char *lock_info_str;
 
   if (STRINGP (Fuser_login_name (Qnil)))
-    user_name = (char *)XSTRING_DATA((Fuser_login_name (Qnil)));
+    user_name = (char *) XSTRING_DATA (Fuser_login_name (Qnil));
   else
     user_name = "";
   if (STRINGP (Fsystem_name ()))
-    host_name = (char *)XSTRING_DATA((Fsystem_name ()));
+    host_name = (char *) XSTRING_DATA (Fsystem_name ());
   else
     host_name = "";
   lock_info_str = (char *)alloca (strlen (user_name) + strlen (host_name)
@@ -157,9 +157,6 @@ lock_file_1 (char *lfname,int force)
 static int
 current_lock_owner (lock_info_type *owner, char *lfname)
 {
-#ifndef index
-  extern char *rindex (), *index ();
-#endif
   int o, p, len, ret;
   int local_owner = 0;
   char *at, *dot;
@@ -195,8 +192,8 @@ current_lock_owner (lock_info_type *owner, char *lfname)
   
   /* Parse USER@HOST.PID.  If can't parse, return -1.  */
   /* The USER is everything before the first @.  */
-  at = index (lfinfo, '@');
-  dot = rindex (lfinfo, '.');
+  at = strchr (lfinfo, '@');
+  dot = strrchr (lfinfo, '.');
   if (!at || !dot) {
     xfree (lfinfo);
     return -1;