diff options
author | Andrew Tridgell <tridge@samba.org> | 2001-07-04 07:39:01 +0000 |
---|---|---|
committer | Andrew Tridgell <tridge@samba.org> | 2001-07-04 07:39:01 +0000 |
commit | 57e7df8ae58020ab653307c1fdfbadd44983e900 (patch) | |
tree | 6de85f9cb899929a0b9187e397c3b99735056347 | |
parent | c41fc06376d1a2b83690612304e85010b5e5f3cf (diff) | |
download | samba-57e7df8ae58020ab653307c1fdfbadd44983e900.tar.gz samba-57e7df8ae58020ab653307c1fdfbadd44983e900.tar.xz samba-57e7df8ae58020ab653307c1fdfbadd44983e900.zip |
missed a couple of strchr calls
-rw-r--r-- | source/include/charset.h | 2 | ||||
-rw-r--r-- | source/include/includes.h | 5 | ||||
-rw-r--r-- | source/lib/cmd_interp.c | 2 | ||||
-rw-r--r-- | source/rpcclient/rpcclient.c | 2 |
4 files changed, 3 insertions, 8 deletions
diff --git a/source/include/charset.h b/source/include/charset.h index 7c6fbe5509b..117de75c009 100644 --- 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 9ed7401df3c..7c1a4a8607c 100644 --- 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 292f0e9e9ec..52f025636a4 100644 --- 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 6e4d60d208e..e66b15bb11e 100644 --- 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'; |