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

First part of patch from moriyama@miraclelinux.com (MORIYAMA Masayuki) to

Browse Source 
fix up netbios names with mb strings. Includes reformat of libsmb/nmblib.c
so it's readable.
Jeremy.
This commit is contained in:
Jeremy Allison
-
parent 0375dace24
commit 966e49a48c
5 changed files with 809 additions and 731 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
source/lib/charcnv.c
View File

@ -823,9 +823,37 @@ size_t push_ascii_pstring(void *dest, const char *src)
return push_ascii(dest, src, sizeof(pstring), STR_TERMINATE);
}
/********************************************************************
Push an nstring - ensure null terminated. Written by
moriyama@miraclelinux.com (MORIYAMA Masayuki).
********************************************************************/
size_t push_ascii_nstring(void *dest, const char *src)
{
return push_ascii(dest, src, sizeof(nstring), STR_TERMINATE);
size_t i, buffer_len, dest_len;
smb_ucs2_t *buffer;
buffer_len = push_ucs2_allocate(&buffer, src);
if (buffer_len == (size_t)-1) {
smb_panic("failed to create UCS2 buffer");
}
dest_len = 0;
for (i = 0; i < buffer_len; i++) {
unsigned char mb[10];
/* Convert one smb_ucs2_t character at a time. */
size_t mb_len = convert_string(CH_UCS2, CH_DOS, buffer+i, sizeof(smb_ucs2_t), mb, sizeof(mb), False);
if ((mb_len != (size_t)-1) && (dest_len + mb_len <= MAX_NETBIOSNAME_LEN - 1)) {
memcpy((char *)dest + dest_len, mb, mb_len);
dest_len += mb_len;
} else {
break;
}
}
((char *)dest)[dest_len] = '\0';
SAFE_FREE(buffer);
return dest_len;
}
/**