diff options
| author | Jeremy Allison <jra@samba.org> | 2000-10-03 19:15:05 +0000 |
|---|---|---|
| committer | Jeremy Allison <jra@samba.org> | 2000-10-03 19:15:05 +0000 |
| commit | f2f373df67a3c6b0bd431c19e3494d45ef0a263c (patch) | |
| tree | 7606489ad8ecacb301fd7fb0ac279e75412bd8cf | |
| parent | d9d3668fa322cbed36ca3393d8268bf0e5255e8d (diff) | |
| download | samba-f2f373df67a3c6b0bd431c19e3494d45ef0a263c.tar.gz samba-f2f373df67a3c6b0bd431c19e3494d45ef0a263c.tar.xz samba-f2f373df67a3c6b0bd431c19e3494d45ef0a263c.zip | |
Fixes for the fact that UNICODE sizes are no always 2*no of chars when
in multibyte codepages. Fix from Hiroshi MIURA, Samba User Group Japan staff.
Jeremy.
| -rw-r--r-- | source/smbd/trans2.c | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/source/smbd/trans2.c b/source/smbd/trans2.c index 9d1aa5dcfe3..2366fceae7c 100644 --- a/source/smbd/trans2.c +++ b/source/smbd/trans2.c @@ -1193,9 +1193,11 @@ static int call_trans2qfsinfo(connection_struct *conn, SIVAL(pdata,12,strlen(vname)); pstrcpy(pdata+18,vname); } else { - data_len = 18 + 2*strlen(vname); - SIVAL(pdata,12,strlen(vname)*2); - dos_PutUniCode(pdata+18,unix_to_dos(vname,False),sizeof(pstring), False); + int vnamelen; + + vnamelen = dos_PutUniCode(pdata+18, vname, sizeof(pstring), False); + data_len = 18 + vnamelen; + SIVAL(pdata,12,vnamelen); SSVAL(outbuf,smb_flg2,SVAL(outbuf,smb_flg2)|FLAGS2_UNICODE_STRINGS); } @@ -1466,10 +1468,9 @@ static int call_trans2qfilepathinfo(connection_struct *conn, *short_name = '\0'; } strupper(short_name); - l = strlen(short_name); - dos_PutUniCode(pdata + 4, unix_to_dos(short_name,False),sizeof(pstring), False); - data_size = 4 + (2*l); - SIVAL(pdata,0,2*l); + l = dos_PutUniCode(pdata + 4, short_name, sizeof(pstring), False); + data_size = 4 + l; + SIVAL(pdata,0,l); } break; @@ -1483,7 +1484,7 @@ static int call_trans2qfilepathinfo(connection_struct *conn, if(strequal(".", fname) && (global_client_caps & CAP_UNICODE)) { l = l*2; SSVAL(outbuf,smb_flg2,SVAL(outbuf,smb_flg2)|FLAGS2_UNICODE_STRINGS); - dos_PutUniCode(pdata + 4, unix_to_dos("\\",False),sizeof(pstring), False); + dos_PutUniCode(pdata + 4, "\\",sizeof(pstring), False); } else { pstrcpy(pdata+4,fname); } |