diff options
Diffstat (limited to 'source3/lib/charcnv.c')
-rw-r--r-- | source3/lib/charcnv.c | 105 |
1 files changed, 0 insertions, 105 deletions
diff --git a/source3/lib/charcnv.c b/source3/lib/charcnv.c index 12c708ed8e..d2633bd8ad 100644 --- a/source3/lib/charcnv.c +++ b/source3/lib/charcnv.c @@ -652,49 +652,6 @@ size_t push_ascii(void *dest, const char *src, size_t dest_len, int flags) return ret; } -size_t push_ascii_fstring(void *dest, const char *src) -{ - return push_ascii(dest, src, sizeof(fstring), 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) -{ - size_t i, buffer_len, dest_len; - smb_ucs2_t *buffer; - - conv_silent = True; - if (!push_ucs2_talloc(talloc_tos(), &buffer, src, &buffer_len)) { - smb_panic("failed to create UCS2 buffer"); - } - - /* We're using buffer_len below to count ucs2 characters, not bytes. */ - buffer_len /= sizeof(smb_ucs2_t); - - dest_len = 0; - for (i = 0; buffer[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_UTF16LE, CH_DOS, buffer+i, sizeof(smb_ucs2_t), mb, sizeof(mb)); - 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 { - errno = E2BIG; - break; - } - } - ((char *)dest)[dest_len] = '\0'; - - conv_silent = False; - TALLOC_FREE(buffer); - return dest_len; -} - /******************************************************************** Push and malloc an ascii string. src and dest null terminated. ********************************************************************/ @@ -854,18 +811,6 @@ static size_t pull_ascii_base_talloc(TALLOC_CTX *ctx, return src_len; } -size_t pull_ascii_fstring(char *dest, const void *src) -{ - return pull_ascii(dest, src, sizeof(fstring), -1, STR_TERMINATE); -} - -/* When pulling an nstring it can expand into a larger size (dos cp -> utf8). Cope with this. */ - -size_t pull_ascii_nstring(char *dest, size_t dest_len, const void *src) -{ - return pull_ascii(dest, src, dest_len, sizeof(nstring)-1, STR_TERMINATE); -} - /** * Copy a string from a char* src to a unicode destination. * @@ -964,51 +909,6 @@ bool push_ucs2_talloc(TALLOC_CTX *ctx, smb_ucs2_t **dest, const char *src, /** - Copy a string from a char* src to a UTF-8 destination. - Return the number of bytes occupied by the string in the destination - Flags can have: - STR_TERMINATE means include the null termination - STR_UPPER means uppercase in the destination - dest_len is the maximum length allowed in the destination. If dest_len - is -1 then no maxiumum is used. -**/ - -static size_t push_utf8(void *dest, const char *src, size_t dest_len, int flags) -{ - size_t src_len = 0; - size_t ret; - char *tmpbuf = NULL; - - if (dest_len == (size_t)-1) { - /* No longer allow dest_len of -1. */ - smb_panic("push_utf8 - invalid dest_len of -1"); - } - - if (flags & STR_UPPER) { - tmpbuf = strupper_talloc(talloc_tos(), src); - if (!tmpbuf) { - return (size_t)-1; - } - src = tmpbuf; - src_len = strlen(src); - } - - src_len = strlen(src); - if (flags & STR_TERMINATE) { - src_len++; - } - - ret = convert_string(CH_UNIX, CH_UTF8, src, src_len, dest, dest_len); - TALLOC_FREE(tmpbuf); - return ret; -} - -size_t push_utf8_fstring(void *dest, const char *src) -{ - return push_utf8(dest, src, sizeof(fstring), STR_TERMINATE); -} - -/** * Copy a string from a unix char* src to a UTF-8 destination, allocating a buffer using talloc * * @param dest always set at least to NULL @@ -1211,11 +1111,6 @@ size_t pull_ucs2_base_talloc(TALLOC_CTX *ctx, return src_len + ucs2_align_len; } -size_t pull_ucs2_fstring(char *dest, const void *src) -{ - return pull_ucs2(NULL, dest, src, sizeof(fstring), -1, STR_TERMINATE); -} - /** * Copy a string from a UCS2 src to a unix char * destination, allocating a buffer using talloc * |