missed a couple of strchr calls

diff --git a/source/include/charset.h b/source/include/charset.h
index 7c6fbe5509b09e69517ddbc1fcf2c95f42c887a0..117de75c0097ea06d7dc2922b9be678992d806e8 100644 (file)
--- a/source/include/charset.h
+++ b/source/include/charset.h
@@ -63,7 +63,7 @@ extern void charset_initialise(void);
 
 /* this is used to determine if a character is safe to use in
    something that may be put on a command line */
-#define issafe(c) (isalnum((c&0xff)) || strchr("-._",c))
+#define issafe(c) (isalnum((c&0xff)) || strchr_m("-._",c))
 #endif
 
 /* Dynamic codepage files defines. */

diff --git a/source/include/includes.h b/source/include/includes.h
index 9ed7401df3cbcf99643e509388a35fe4c4509797..7c1a4a8607ce30f29798672167b18fd2f27d627d 100644 (file)
--- a/source/include/includes.h
+++ b/source/include/includes.h
@@ -611,11 +611,6 @@ extern char *sys_errlist[];
 #define strerror(i) sys_errlist[i]
 #endif
 
-#ifndef HAVE_STRCHR
-# define strchr                 index
-# define strrchr                rindex
-#endif
-
 #ifndef HAVE_ERRNO_DECL
 extern int errno;
 #endif

diff --git a/source/lib/cmd_interp.c b/source/lib/cmd_interp.c
index 292f0e9e9ec431d62c1b9ff335e206883ad72efb..52f025636a492ab624dcac4b300a8e7ba9384977 100644 (file)
--- a/source/lib/cmd_interp.c
+++ b/source/lib/cmd_interp.c
@@ -895,7 +895,7 @@ static void read_authfile (char *filename, char* username, char* password)
                /* break up the line into parameter & value.
                   will need to eat a little whitespace possibly */
                param = buf;
-               if (!(ptr = strchr (buf, '=')))
+               if (!(ptr = strchr_m(buf, '=')))
                        continue;
                val = ptr+1;
                *ptr = '\0';

diff --git a/source/rpcclient/rpcclient.c b/source/rpcclient/rpcclient.c
index 6e4d60d208ec9a2082fd6c5b07be000e58b663ff..e66b15bb11e7b13af9dee5eeebfdc0a294956626 100644 (file)
--- a/source/rpcclient/rpcclient.c
+++ b/source/rpcclient/rpcclient.c
@@ -132,7 +132,7 @@ static void read_authfile (
                /* break up the line into parameter & value.
                   will need to eat a little whitespace possibly */
                param = buf;
-               if (!(ptr = strchr (buf, '=')))
+               if (!(ptr = strchr_m(buf, '=')))
                        continue;
                val = ptr+1;
                *ptr = '\0';