p += srvstr_pull(inbuf, dev, p, sizeof(dev), -1, STR_TERMINATE) + 1;
*user = 0;
- p = strchr(service,'%');
+ p = strchr_m(service,'%');
if (p != NULL) {
*p = 0;
fstrcpy(user,p+1);
}
- p = strrchr(service,'\\');
+ p = strrchr_m(service,'\\');
if (p) {
pstrcpy(service, p+1);
}
passlen = strlen(password);
}
- q = strchr(path+2,'\\');
+ q = strchr_m(path+2,'\\');
if (!q) {
END_PROFILE(SMBtconX);
return(ERROR(ERRDOS,ERRnosuchshare));
}
fstrcpy(service,q+1);
- q = strchr(service,'%');
+ q = strchr_m(service,'%');
if (q) {
*q++ = 0;
fstrcpy(user,q);
if (!check_name(directory,conn))
can_open = False;
- p = strrchr(dir2,'/');
+ p = strrchr_m(dir2,'/');
if (p == NULL)
{
pstrcpy(mask,dir2);
pstrcpy(mask,p+1);
}
- p = strrchr(directory,'/');
+ p = strrchr_m(directory,'/');
if (!p)
*directory = 0;
else
rc = unix_convert(name,conn,0,&bad_path,&sbuf);
- p = strrchr(name,'/');
+ p = strrchr_m(name,'/');
if (!p) {
pstrcpy(directory,"./");
pstrcpy(mask,name);
fstring ext1,ext2;
char *p,*p2;
- name1 = strrchr(name1,'/');
- name2 = strrchr(name2,'/');
+ name1 = strrchr_m(name1,'/');
+ name2 = strrchr_m(name2,'/');
if (!name1 || !name2) return(False);
fstrcpy(root1,name1);
fstrcpy(root2,name2);
- p = strrchr(root1,'.');
+ p = strrchr_m(root1,'.');
if (p) {
*p = 0;
fstrcpy(ext1,p+1);
} else {
fstrcpy(ext1,"");
}
- p = strrchr(root2,'.');
+ p = strrchr_m(root2,'.');
if (p) {
*p = 0;
fstrcpy(ext2,p+1);
* as this is checked in resolve_wildcards().
*/
- p = strrchr(name,'/');
+ p = strrchr_m(name,'/');
if (!p) {
pstrcpy(directory,".");
pstrcpy(mask,name);
pstrcat(directory,mask);
/* Ensure newname contains a '/' also */
- if(strrchr(newname,'/') == 0) {
+ if(strrchr_m(newname,'/') == 0) {
pstring tmpstr;
pstrcpy(tmpstr, "./");
* Note that we guarantee that newname contains a '/'
* character above.
*/
- p = strrchr(newname,'/');
+ p = strrchr_m(newname,'/');
pstrcpy(newname_modified_last_component,p+1);
if(strcsequal(newname_modified_last_component,
pstrcpy(dest,dest1);
if (target_is_directory) {
- char *p = strrchr(src,'/');
+ char *p = strrchr_m(src,'/');
if (p)
p++;
else
return(ERROR(ERRSRV,ERRerror));
}
- p = strrchr(name,'/');
+ p = strrchr_m(name,'/');
if (!p) {
pstrcpy(directory,"./");
pstrcpy(mask,name);