sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-08-03 04:22:09 +03:00
Code Activity

made some LANMAN1 wildcard progress

Browse Source 
it now handles -M LANMAN1 -f '.x' -m '?x' nicely
(This used to be commit e7ccb9be6d)
This commit is contained in:
Andrew Tridgell
2001-02-26 06:53:42 +00:00
parent 8cfc745339
commit 0d54de536c
4 changed files with 24 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
source3/libsmb/clilist.c
View File

@ -133,10 +133,14 @@ static int interpret_long_filename(struct cli_state *cli,
p += 4; /* EA size */
slen = SVAL(p, 0);
p += 2;
clistr_pull(cli, finfo->short_name, p,
sizeof(finfo->short_name),
24,
CLISTR_CONVERT);
{
/* stupid NT bugs. grr */
int flags = CLISTR_CONVERT;
if (p[1] == 0 && namelen > 1) flags |= CLISTR_UNICODE;
clistr_pull(cli, finfo->short_name, p,
sizeof(finfo->short_name),
24, flags);
}
p += 24; /* short name? */
clistr_pull(cli, finfo->name, p,
sizeof(finfo->name),
@ -159,8 +163,7 @@ int cli_list_new(struct cli_state *cli,const char *Mask,uint16 attribute,
void (*fn)(file_info *, const char *, void *), void *state)
{
int max_matches = 512;
/* NT uses 260, OS/2 uses 2. Both accept 1. */
int info_level = cli->protocol<PROTOCOL_NT1?1:260;
int info_level;
char *p, *p2;
pstring mask;
file_info finfo;
@ -179,6 +182,9 @@ int cli_list_new(struct cli_state *cli,const char *Mask,uint16 attribute,
uint16 setup;
pstring param;
/* NT uses 260, OS/2 uses 2. Both accept 1. */
info_level = (cli->capabilities&CAP_NT_SMBS)?260:1;
pstrcpy(mask,Mask);
while (ff_eos == 0) {