summaryrefslogtreecommitdiff
path: root/source3
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>2001-07-25 13:19:14 +0000
committerAndrew Tridgell <tridge@samba.org>2001-07-25 13:19:14 +0000
commit5489bd79b1582253a1e1bb5213cd8ddc7750a65e (patch)
treea465b060f1de66e6aaa67bc181ee865b526ada3e /source3
parent648528196ca136469d82b83cd2ba89b1b30290ae (diff)
downloadsamba-5489bd79b1582253a1e1bb5213cd8ddc7750a65e.tar.gz
samba-5489bd79b1582253a1e1bb5213cd8ddc7750a65e.tar.bz2
samba-5489bd79b1582253a1e1bb5213cd8ddc7750a65e.zip
need to push smb_search strings in client charset
(This used to be commit df00e5dceae91f6ffca77704c4517b91fd796d32)
Diffstat (limited to 'source3')
-rw-r--r--source3/lib/util.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/source3/lib/util.c b/source3/lib/util.c
index d45a805200..282e0e43fa 100644
--- a/source3/lib/util.c
+++ b/source3/lib/util.c
@@ -431,22 +431,22 @@ void make_dir_struct(char *buf,char *mask,char *fname,SMB_OFF_T size,int mode,ti
if ((p = strchr_m(mask2,'.')) != NULL)
{
*p = 0;
- memcpy(buf+1,mask2,MIN(strlen(mask2),8));
- memcpy(buf+9,p+1,MIN(strlen(p+1),3));
+ push_ascii(buf+1,mask2,8, 0);
+ push_ascii(buf+9,p+1,3, 0);
*p = '.';
}
else
- memcpy(buf+1,mask2,MIN(strlen(mask2),11));
+ push_ascii(buf+1,mask2,11, 0);
memset(buf+21,'\0',DIR_STRUCT_SIZE-21);
CVAL(buf,21) = mode;
put_dos_date(buf,22,date);
SSVAL(buf,26,size & 0xFFFF);
SSVAL(buf,28,(size >> 16)&0xFFFF);
- StrnCpy(buf+30,fname,12);
+ push_ascii(buf+30,fname,12, 0);
if (!case_sensitive)
strupper(buf+30);
- DEBUG(8,("put name [%s] into dir struct\n",buf+30));
+ DEBUG(8,("put name [%s] from [%s] into dir struct\n",buf+30, fname));
}