Use strchr, strrchr instead of index, rindex

* callint.c (Fcall_interactively): Use strchr, strrchr instead of
index, rindex.
* doc.c (get_doc_string, Fsnarf_documentation): Likewise.
* editfns.c (Fuser_full_name, Fformat): Likewise.
* emacs.c (argmatch, sort_args, decode_env_path): Likewise.
* fileio.c (Ffile_symlink_p): Likewise.
* filelock.c (current_lock_owner): Likewise.
* font.c (font_parse_name, font_parse_family_registry): Likewise.
* fontset.c (fontset_pattern_regexp): Likewise.
* lread.c (read1): Likewise.
* sysdep.c (init_system_name): Likewise.
* xfns.c (select_visual): Likewise.
* s/hpux10-20.h (index, rindex): Don't define.
* s/ms-w32.h (index): Likewise.
* s/usg5-4.h: Likewise.

* sed2v2.inp (HAVE_INDEX, HAVE_RINDEX): Don't edit.
(HAVE_STRCHR, HAVE_STRRCHR): Edit to 1.

* emacsclient.c (set_local_socket): Use strchr, strrchr instead of
index, rindex.
* movemail.c (mail_spool_name, popmail): Likewise.
* pop.c (pop_list): Likewise.

* CPP-DEFINES (HAVE_INDEX, HAVE_RINDEX): Remove.

* configure.in: Don't check for index and rindex, check for strchr
and strrchr.  Define strchr and strrchr as index and rindex,
resp., in src/config.h if not available.

4 files changed, 15 insertions, 12 deletions

diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog
index 125e0df4817..d0410f4c080 100644
--- a/lib-src/ChangeLog
+++ b/lib-src/ChangeLog
@@ -1,3 +1,10 @@
+2010-07-11  Andreas Schwab  <schwab@linux-m68k.org>
+
+        * emacsclient.c (set_local_socket): Use strchr, strrchr instead of
+        index, rindex.
+        * movemail.c (mail_spool_name, popmail): Likewise.
+        * pop.c (pop_list): Likewise.
+
 2010-07-11  Eli Zaretskii  <eliz@gnu.org>
 
         * makefile.w32-in (obj): Add menu.o, bidi.o, w32uniscrobe.o,
diff --git a/lib-src/emacsclient.c b/lib-src/emacsclient.c
index cb8a4ebcaf8..79143ff7a34 100644
--- a/lib-src/emacsclient.c
+++ b/lib-src/emacsclient.c
@@ -1234,8 +1234,10 @@ set_local_socket (void)
     char *server_name = "server";
     char *tmpdir;
 
-    if (socket_name && !index (socket_name, '/') && !index (socket_name, '\\'))
-      { /* socket_name is a file name component.  */
+    if (socket_name && !strchr (socket_name, '/')
+        && !strchr (socket_name, '\\'))
+      {
+        /* socket_name is a file name component.  */
         server_name = socket_name;
         socket_name = NULL;
         default_sock = 1;       /* Try both UIDs.  */
diff --git a/lib-src/movemail.c b/lib-src/movemail.c
index dfa4a92d057..541edf545df 100644
--- a/lib-src/movemail.c
+++ b/lib-src/movemail.c
@@ -146,12 +146,6 @@ static char *mail_spool_name ();
 #ifndef HAVE_STRERROR
 char *strerror (int);
 #endif
-#ifdef HAVE_INDEX
-extern char *index (const char *, int);
-#endif
-#ifdef HAVE_RINDEX
-extern char *rindex (const char *, int);
-#endif
 
 static void fatal (char *s1, char *s2, char *s3);
 static void error (char *s1, char *s2, char *s3);
@@ -564,7 +558,7 @@ mail_spool_name (inname)
   char *indir, *fname;
   int status;
 
-  if (! (fname = rindex (inname, '/')))
+  if (! (fname = strrchr (inname, '/')))
     return NULL;
 
   fname++;
@@ -714,7 +708,7 @@ popmail (char *mailbox, char *outfile, int preserve, char *password, int reverse
   char *user, *hostname;
 
   user = mailbox;
-  if ((hostname = index(mailbox, ':')))
+  if ((hostname = strchr (mailbox, ':')))
     *hostname++ = '\0';
 
   server = pop_open (hostname, user, password, POP_NO_GETPASS);
diff --git a/lib-src/pop.c b/lib-src/pop.c
index 9eaefa4cb83..26a992fa0b0 100644
--- a/lib-src/pop.c
+++ b/lib-src/pop.c
@@ -465,7 +465,7 @@ pop_list (popserver server, int message, int **IDs, int **sizes)
           return (-1);
         }
       (*IDs)[0] = atoi (&fromserver[4]);
-      fromserver = index (&fromserver[4], ' ');
+      fromserver = strchr (&fromserver[4], ' ');
       if (! fromserver)
         {
           strcpy (pop_error,
@@ -496,7 +496,7 @@ pop_list (popserver server, int message, int **IDs, int **sizes)
               return (-1);
             }
           (*IDs)[i] = atoi (fromserver);
-          fromserver = index (fromserver, ' ');
+          fromserver = strchr (fromserver, ' ');
           if (! fromserver)
             {
               strcpy (pop_error,