mirror of
https://github.com/samba-team/samba.git
synced 2025-12-12 12:23:50 +03:00
r4697: Fix for bug #2231 inspired by brad.ellis@its.monash.edu.au.
Remove double "\\" from findfirst. Jeremy.
This commit is contained in:
committed by
Gerald (Jerry) Carter
parent
9a29bef056
commit
88a89b3105
@@ -582,17 +582,17 @@ static int cmd_dir(void)
|
|||||||
if(mask[strlen(mask)-1]!='\\')
|
if(mask[strlen(mask)-1]!='\\')
|
||||||
pstrcat(mask,"\\");
|
pstrcat(mask,"\\");
|
||||||
} else {
|
} else {
|
||||||
*mask = '\0';
|
pstrcpy(mask, "\\");
|
||||||
}
|
}
|
||||||
|
|
||||||
if (next_token_nr(NULL,buf,NULL,sizeof(buf))) {
|
if (next_token_nr(NULL,buf,NULL,sizeof(buf))) {
|
||||||
dos_format(p);
|
dos_format(p);
|
||||||
if (*p == '\\')
|
if (*p == '\\')
|
||||||
pstrcpy(mask,p);
|
pstrcpy(mask,p + 1);
|
||||||
else
|
else
|
||||||
pstrcat(mask,p);
|
pstrcat(mask,p);
|
||||||
} else {
|
} else {
|
||||||
pstrcat(mask,"\\*");
|
pstrcat(mask,"*");
|
||||||
}
|
}
|
||||||
|
|
||||||
do_list(mask, attribute, display_finfo, recurse, True);
|
do_list(mask, attribute, display_finfo, recurse, True);
|
||||||
|
|||||||
Reference in New Issue
Block a user