diff options
author | Andrew Tridgell <tridge@samba.org> | 2001-07-04 07:36:09 +0000 |
---|---|---|
committer | Andrew Tridgell <tridge@samba.org> | 2001-07-04 07:36:09 +0000 |
commit | 527e824293ee934ca5da0ef5424efe5ab7757248 (patch) | |
tree | dd86fab3b0ba9cdbd86661dfae562fa123a8f53c /source3/torture/masktest.c | |
parent | 87fbb7092b8f8b2f0db0f361c3d625e19de57cd9 (diff) | |
download | samba-527e824293ee934ca5da0ef5424efe5ab7757248.tar.gz |
strchr and strrchr are macros when compiling with optimisation in gcc, so we can't redefine them. damn.
(This used to be commit c41fc06376d1a2b83690612304e85010b5e5f3cf)
Diffstat (limited to 'source3/torture/masktest.c')
-rw-r--r-- | source3/torture/masktest.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/source3/torture/masktest.c b/source3/torture/masktest.c index a10a4e954c9..0acdb0d95cc 100644 --- a/source3/torture/masktest.c +++ b/source3/torture/masktest.c @@ -76,7 +76,7 @@ int ms_fnmatch_lanman_core(char *pattern, char *string) case '<': for (; *n; n++) { if (ms_fnmatch_lanman_core(p, n) == 0) goto match; - if (*n == '.' && !strchr(n+1,'.')) { + if (*n == '.' && !strchr_m(n+1,'.')) { n++; break; } @@ -146,7 +146,7 @@ static char *reg_test(char *pattern, char *long_name, char *short_name) static fstring ret; fstrcpy(ret, "---"); - pattern = 1+strrchr(pattern,'\\'); + pattern = 1+strrchr_m(pattern,'\\'); if (reg_match_one(pattern, ".")) ret[0] = '+'; if (reg_match_one(pattern, "..")) ret[1] = '+'; @@ -169,7 +169,7 @@ struct cli_state *connect_one(char *share) extern struct in_addr ipzero; server = share+2; - share = strchr(server,'\\'); + share = strchr_m(server,'\\'); if (!share) return NULL; *share = 0; share++; @@ -289,7 +289,7 @@ static void get_real_name(struct cli_state *cli, } #if 0 - if (!strchr(short_name,'.')) { + if (!strchr_m(short_name,'.')) { fstrcat(short_name,"."); } #endif @@ -468,7 +468,7 @@ static void usage(void) break; case 'U': pstrcpy(username,optarg); - p = strchr(username,'%'); + p = strchr_m(username,'%'); if (p) { *p = 0; pstrcpy(password, p+1); |