2003-08-13 05:53:07 +04:00
/*
Unix SMB / CIFS implementation .
Character set conversion Extensions
Copyright ( C ) Igor Vergeichik < iverg @ mail . ru > 2001
Copyright ( C ) Andrew Tridgell 2001
Copyright ( C ) Simo Sorce 2001
This program is free software ; you can redistribute it and / or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation ; either version 2 of the License , or
( at your option ) any later version .
This program is distributed in the hope that it will be useful ,
but WITHOUT ANY WARRANTY ; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE . See the
GNU General Public License for more details .
You should have received a copy of the GNU General Public License
along with this program ; if not , write to the Free Software
Foundation , Inc . , 675 Mass Ave , Cambridge , MA 0213 9 , USA .
*/
# include "includes.h"
/**
* @ file
*
* @ brief Character - set conversion routines built on our iconv .
*
* @ note Samba ' s internal character set ( at least in the 3.0 series )
* is always the same as the one for the Unix filesystem . It is
* < b > not < / b > necessarily UTF - 8 and may be different on machines that
* need i18n filenames to be compatible with Unix software . It does
* have to be a superset of ASCII . All multibyte sequences must start
* with a byte with the high bit set .
*
* @ sa lib / iconv . c
*/
/**
* Return the name of a charset to give to iconv ( ) .
* */
static const char * charset_name ( charset_t ch )
{
const char * ret = NULL ;
2004-09-01 08:39:06 +04:00
if ( ch = = CH_UTF16 ) ret = " UTF-16LE " ;
2003-08-13 05:53:07 +04:00
else if ( ch = = CH_UNIX ) ret = lp_unix_charset ( ) ;
else if ( ch = = CH_DOS ) ret = lp_dos_charset ( ) ;
else if ( ch = = CH_DISPLAY ) ret = lp_display_charset ( ) ;
else if ( ch = = CH_UTF8 ) ret = " UTF8 " ;
2004-09-01 08:39:06 +04:00
else if ( ch = = CH_UTF16BE ) ret = " UTF-16BE " ;
2003-08-13 05:53:07 +04:00
if ( ! ret | | ! * ret ) ret = " ASCII " ;
return ret ;
}
static void lazy_initialize_conv ( void )
{
static int initialized = False ;
if ( ! initialized ) {
initialized = True ;
load_case_tables ( ) ;
init_iconv ( ) ;
}
}
2004-09-26 05:08:29 +04:00
static smb_iconv_t conv_handles [ NUM_CHARSETS ] [ NUM_CHARSETS ] ;
/*
on - demand initialisation of conversion handles
*/
static smb_iconv_t get_conv_handle ( charset_t from , charset_t to )
2003-08-13 05:53:07 +04:00
{
2004-09-26 05:08:29 +04:00
const char * n1 , * n2 ;
2003-08-13 05:53:07 +04:00
2004-09-26 05:08:29 +04:00
if ( conv_handles [ from ] [ to ] ) {
return conv_handles [ from ] [ to ] ;
}
2003-08-13 05:53:07 +04:00
2004-09-26 05:08:29 +04:00
n1 = charset_name ( from ) ;
n2 = charset_name ( to ) ;
2003-08-13 05:53:07 +04:00
2004-09-26 05:08:29 +04:00
conv_handles [ from ] [ to ] = smb_iconv_open ( n2 , n1 ) ;
return conv_handles [ from ] [ to ] ;
}
/**
re - initialize iconv conversion descriptors
* */
void init_iconv ( void )
{
charset_t c1 , c2 ;
2003-08-13 05:53:07 +04:00
for ( c1 = 0 ; c1 < NUM_CHARSETS ; c1 + + ) {
for ( c2 = 0 ; c2 < NUM_CHARSETS ; c2 + + ) {
2004-09-26 05:08:29 +04:00
if ( conv_handles [ c1 ] [ c2 ] ! = NULL ) {
2004-09-26 05:41:55 +04:00
if ( conv_handles [ c1 ] [ c2 ] ! = ( smb_iconv_t ) - 1 ) {
2004-09-26 05:08:29 +04:00
smb_iconv_close ( conv_handles [ c1 ] [ c2 ] ) ;
}
2003-08-13 05:53:07 +04:00
conv_handles [ c1 ] [ c2 ] = NULL ;
}
}
}
}
/**
* Convert string from one encoding to another , making error checking etc
*
* @ param src pointer to source string ( multibyte or singlebyte )
* @ param srclen length of the source string in bytes
* @ param dest pointer to destination string ( multibyte or singlebyte )
* @ param destlen maximal length allowed for string
* @ returns the number of bytes occupied in the destination
* */
ssize_t convert_string ( charset_t from , charset_t to ,
void const * src , size_t srclen ,
void * dest , size_t destlen )
{
size_t i_len , o_len ;
size_t retval ;
const char * inbuf = ( const char * ) src ;
char * outbuf = ( char * ) dest ;
smb_iconv_t descriptor ;
if ( srclen = = ( size_t ) - 1 )
srclen = strlen ( src ) + 1 ;
lazy_initialize_conv ( ) ;
2004-09-26 05:08:29 +04:00
descriptor = get_conv_handle ( from , to ) ;
2003-08-13 05:53:07 +04:00
if ( descriptor = = ( smb_iconv_t ) - 1 | | descriptor = = ( smb_iconv_t ) 0 ) {
/* conversion not supported, use as is */
size_t len = MIN ( srclen , destlen ) ;
memcpy ( dest , src , len ) ;
return len ;
}
i_len = srclen ;
o_len = destlen ;
retval = smb_iconv ( descriptor , & inbuf , & i_len , & outbuf , & o_len ) ;
if ( retval = = ( size_t ) - 1 ) {
2003-08-15 22:54:44 +04:00
const char * reason ;
2003-08-13 05:53:07 +04:00
switch ( errno ) {
case EINVAL :
reason = " Incomplete multibyte sequence " ;
break ;
case E2BIG :
reason = " No more room " ;
2004-09-17 14:41:53 +04:00
if ( from = = CH_UNIX ) {
DEBUG ( 0 , ( " E2BIG: convert_string(%s,%s): srclen=%d destlen=%d - '%s' \n " ,
charset_name ( from ) , charset_name ( to ) ,
srclen , destlen , ( const char * ) src ) ) ;
} else {
DEBUG ( 0 , ( " E2BIG: convert_string(%s,%s): srclen=%d destlen=%d \n " ,
charset_name ( from ) , charset_name ( to ) ,
srclen , destlen ) ) ;
}
2003-08-13 05:53:07 +04:00
break ;
case EILSEQ :
reason = " Illegal multibyte sequence " ;
break ;
}
/* smb_panic(reason); */
}
return destlen - o_len ;
}
/**
r2552: Character set conversion and string handling updates.
The intial motivation for this commit was to merge in some of the
bugfixes present in Samba3's chrcnv and string handling code into
Samba4. However, along the way I found a lot of unused functions, and
decided to do a bit more...
The strlen_m code now does not use a fixed buffer, but more work is
needed to finish off other functions in str_util.c. These fixed
length buffers hav caused very nasty, hard to chase down bugs at some
sites.
The strupper_m() function has a strupper_talloc() to replace it (we
need to go around and fix more uses, but it's a start). Use of these
new functions will avoid bugs where the upper or lowercase version of
a string is a different length.
I have removed the push_*_allocate functions, which are replaced by
calls to push_*_talloc. Likewise, pstring and other 'fixed length'
wrappers are removed, where possible.
I have removed the first ('base pointer') argument, used by push_ucs2,
as the Samba4 way of doing things ensures that this is always on an
even boundary anyway. (It was used in only one place, in any case).
(This used to be commit dfecb0150627b500cb026b8a4932fe87902ca392)
2004-09-23 04:51:45 +04:00
* Convert between character sets , allocating a new buffer using talloc for the result .
2003-08-13 05:53:07 +04:00
*
* @ param srclen length of source buffer .
* @ param dest always set at least to NULL
* @ note - 1 is not accepted for srclen .
*
* @ returns Size in bytes of the converted string ; or - 1 in case of error .
* */
r2552: Character set conversion and string handling updates.
The intial motivation for this commit was to merge in some of the
bugfixes present in Samba3's chrcnv and string handling code into
Samba4. However, along the way I found a lot of unused functions, and
decided to do a bit more...
The strlen_m code now does not use a fixed buffer, but more work is
needed to finish off other functions in str_util.c. These fixed
length buffers hav caused very nasty, hard to chase down bugs at some
sites.
The strupper_m() function has a strupper_talloc() to replace it (we
need to go around and fix more uses, but it's a start). Use of these
new functions will avoid bugs where the upper or lowercase version of
a string is a different length.
I have removed the push_*_allocate functions, which are replaced by
calls to push_*_talloc. Likewise, pstring and other 'fixed length'
wrappers are removed, where possible.
I have removed the first ('base pointer') argument, used by push_ucs2,
as the Samba4 way of doing things ensures that this is always on an
even boundary anyway. (It was used in only one place, in any case).
(This used to be commit dfecb0150627b500cb026b8a4932fe87902ca392)
2004-09-23 04:51:45 +04:00
ssize_t convert_string_talloc ( TALLOC_CTX * ctx , charset_t from , charset_t to ,
2003-08-13 05:53:07 +04:00
void const * src , size_t srclen , void * * dest )
{
size_t i_len , o_len , destlen ;
size_t retval ;
const char * inbuf = ( const char * ) src ;
char * outbuf , * ob ;
smb_iconv_t descriptor ;
* dest = NULL ;
if ( src = = NULL | | srclen = = ( size_t ) - 1 | | srclen = = 0 )
return ( size_t ) - 1 ;
lazy_initialize_conv ( ) ;
2004-09-26 05:08:29 +04:00
descriptor = get_conv_handle ( from , to ) ;
2003-08-13 05:53:07 +04:00
if ( descriptor = = ( smb_iconv_t ) - 1 | | descriptor = = ( smb_iconv_t ) 0 ) {
/* conversion not supported, return -1*/
r2552: Character set conversion and string handling updates.
The intial motivation for this commit was to merge in some of the
bugfixes present in Samba3's chrcnv and string handling code into
Samba4. However, along the way I found a lot of unused functions, and
decided to do a bit more...
The strlen_m code now does not use a fixed buffer, but more work is
needed to finish off other functions in str_util.c. These fixed
length buffers hav caused very nasty, hard to chase down bugs at some
sites.
The strupper_m() function has a strupper_talloc() to replace it (we
need to go around and fix more uses, but it's a start). Use of these
new functions will avoid bugs where the upper or lowercase version of
a string is a different length.
I have removed the push_*_allocate functions, which are replaced by
calls to push_*_talloc. Likewise, pstring and other 'fixed length'
wrappers are removed, where possible.
I have removed the first ('base pointer') argument, used by push_ucs2,
as the Samba4 way of doing things ensures that this is always on an
even boundary anyway. (It was used in only one place, in any case).
(This used to be commit dfecb0150627b500cb026b8a4932fe87902ca392)
2004-09-23 04:51:45 +04:00
DEBUG ( 3 , ( " convert_string_talloc: conversion not supported! \n " ) ) ;
2003-08-13 05:53:07 +04:00
return - 1 ;
}
destlen = MAX ( srclen , 512 ) ;
outbuf = NULL ;
convert :
destlen = destlen * 2 ;
2004-09-27 05:36:19 +04:00
ob = ( char * ) talloc_realloc ( ctx , outbuf , destlen ) ;
2003-08-13 05:53:07 +04:00
if ( ! ob ) {
r2552: Character set conversion and string handling updates.
The intial motivation for this commit was to merge in some of the
bugfixes present in Samba3's chrcnv and string handling code into
Samba4. However, along the way I found a lot of unused functions, and
decided to do a bit more...
The strlen_m code now does not use a fixed buffer, but more work is
needed to finish off other functions in str_util.c. These fixed
length buffers hav caused very nasty, hard to chase down bugs at some
sites.
The strupper_m() function has a strupper_talloc() to replace it (we
need to go around and fix more uses, but it's a start). Use of these
new functions will avoid bugs where the upper or lowercase version of
a string is a different length.
I have removed the push_*_allocate functions, which are replaced by
calls to push_*_talloc. Likewise, pstring and other 'fixed length'
wrappers are removed, where possible.
I have removed the first ('base pointer') argument, used by push_ucs2,
as the Samba4 way of doing things ensures that this is always on an
even boundary anyway. (It was used in only one place, in any case).
(This used to be commit dfecb0150627b500cb026b8a4932fe87902ca392)
2004-09-23 04:51:45 +04:00
DEBUG ( 0 , ( " convert_string_talloc: realloc failed! \n " ) ) ;
talloc_free ( outbuf ) ;
2003-08-13 05:53:07 +04:00
return ( size_t ) - 1 ;
}
else
outbuf = ob ;
i_len = srclen ;
o_len = destlen ;
retval = smb_iconv ( descriptor ,
& inbuf , & i_len ,
& outbuf , & o_len ) ;
if ( retval = = ( size_t ) - 1 ) {
const char * reason = " unknown error " ;
switch ( errno ) {
case EINVAL :
reason = " Incomplete multibyte sequence " ;
break ;
case E2BIG :
goto convert ;
case EILSEQ :
reason = " Illegal multibyte sequence " ;
break ;
}
DEBUG ( 0 , ( " Conversion error: %s(%s) \n " , reason , inbuf ) ) ;
r2552: Character set conversion and string handling updates.
The intial motivation for this commit was to merge in some of the
bugfixes present in Samba3's chrcnv and string handling code into
Samba4. However, along the way I found a lot of unused functions, and
decided to do a bit more...
The strlen_m code now does not use a fixed buffer, but more work is
needed to finish off other functions in str_util.c. These fixed
length buffers hav caused very nasty, hard to chase down bugs at some
sites.
The strupper_m() function has a strupper_talloc() to replace it (we
need to go around and fix more uses, but it's a start). Use of these
new functions will avoid bugs where the upper or lowercase version of
a string is a different length.
I have removed the push_*_allocate functions, which are replaced by
calls to push_*_talloc. Likewise, pstring and other 'fixed length'
wrappers are removed, where possible.
I have removed the first ('base pointer') argument, used by push_ucs2,
as the Samba4 way of doing things ensures that this is always on an
even boundary anyway. (It was used in only one place, in any case).
(This used to be commit dfecb0150627b500cb026b8a4932fe87902ca392)
2004-09-23 04:51:45 +04:00
talloc_free ( outbuf ) ;
2003-08-13 05:53:07 +04:00
/* smb_panic(reason); */
return ( size_t ) - 1 ;
}
destlen = destlen - o_len ;
r2552: Character set conversion and string handling updates.
The intial motivation for this commit was to merge in some of the
bugfixes present in Samba3's chrcnv and string handling code into
Samba4. However, along the way I found a lot of unused functions, and
decided to do a bit more...
The strlen_m code now does not use a fixed buffer, but more work is
needed to finish off other functions in str_util.c. These fixed
length buffers hav caused very nasty, hard to chase down bugs at some
sites.
The strupper_m() function has a strupper_talloc() to replace it (we
need to go around and fix more uses, but it's a start). Use of these
new functions will avoid bugs where the upper or lowercase version of
a string is a different length.
I have removed the push_*_allocate functions, which are replaced by
calls to push_*_talloc. Likewise, pstring and other 'fixed length'
wrappers are removed, where possible.
I have removed the first ('base pointer') argument, used by push_ucs2,
as the Samba4 way of doing things ensures that this is always on an
even boundary anyway. (It was used in only one place, in any case).
(This used to be commit dfecb0150627b500cb026b8a4932fe87902ca392)
2004-09-23 04:51:45 +04:00
/* +2 for mandetory null termination, UTF8 or UTF16 */
2004-09-27 05:36:19 +04:00
* dest = ( char * ) talloc_realloc ( ctx , ob , destlen + 2 ) ;
2003-08-13 05:53:07 +04:00
if ( ! * dest ) {
r2552: Character set conversion and string handling updates.
The intial motivation for this commit was to merge in some of the
bugfixes present in Samba3's chrcnv and string handling code into
Samba4. However, along the way I found a lot of unused functions, and
decided to do a bit more...
The strlen_m code now does not use a fixed buffer, but more work is
needed to finish off other functions in str_util.c. These fixed
length buffers hav caused very nasty, hard to chase down bugs at some
sites.
The strupper_m() function has a strupper_talloc() to replace it (we
need to go around and fix more uses, but it's a start). Use of these
new functions will avoid bugs where the upper or lowercase version of
a string is a different length.
I have removed the push_*_allocate functions, which are replaced by
calls to push_*_talloc. Likewise, pstring and other 'fixed length'
wrappers are removed, where possible.
I have removed the first ('base pointer') argument, used by push_ucs2,
as the Samba4 way of doing things ensures that this is always on an
even boundary anyway. (It was used in only one place, in any case).
(This used to be commit dfecb0150627b500cb026b8a4932fe87902ca392)
2004-09-23 04:51:45 +04:00
DEBUG ( 0 , ( " convert_string_talloc: out of memory! \n " ) ) ;
talloc_free ( ob ) ;
2003-08-13 05:53:07 +04:00
return ( size_t ) - 1 ;
}
r2552: Character set conversion and string handling updates.
The intial motivation for this commit was to merge in some of the
bugfixes present in Samba3's chrcnv and string handling code into
Samba4. However, along the way I found a lot of unused functions, and
decided to do a bit more...
The strlen_m code now does not use a fixed buffer, but more work is
needed to finish off other functions in str_util.c. These fixed
length buffers hav caused very nasty, hard to chase down bugs at some
sites.
The strupper_m() function has a strupper_talloc() to replace it (we
need to go around and fix more uses, but it's a start). Use of these
new functions will avoid bugs where the upper or lowercase version of
a string is a different length.
I have removed the push_*_allocate functions, which are replaced by
calls to push_*_talloc. Likewise, pstring and other 'fixed length'
wrappers are removed, where possible.
I have removed the first ('base pointer') argument, used by push_ucs2,
as the Samba4 way of doing things ensures that this is always on an
even boundary anyway. (It was used in only one place, in any case).
(This used to be commit dfecb0150627b500cb026b8a4932fe87902ca392)
2004-09-23 04:51:45 +04:00
( ( char * ) * dest ) [ destlen ] = ' \0 ' ;
( ( char * ) * dest ) [ destlen + 1 ] = ' \0 ' ;
2003-08-13 05:53:07 +04:00
return destlen ;
}
/**
* Copy a string from a char * unix src to a dos codepage string destination .
*
* @ return the number of bytes occupied by the string in the destination .
*
* @ param flags can include
* < dl >
* < dt > STR_TERMINATE < / dt > < dd > means include the null termination < / dd >
* < dt > STR_UPPER < / dt > < dd > means uppercase in the destination < / dd >
* < / dl >
*
* @ param dest_len the maximum length in bytes allowed in the
* destination . If @ p dest_len is - 1 then no maximum is used .
* */
ssize_t push_ascii ( void * dest , const char * src , size_t dest_len , int flags )
{
r2552: Character set conversion and string handling updates.
The intial motivation for this commit was to merge in some of the
bugfixes present in Samba3's chrcnv and string handling code into
Samba4. However, along the way I found a lot of unused functions, and
decided to do a bit more...
The strlen_m code now does not use a fixed buffer, but more work is
needed to finish off other functions in str_util.c. These fixed
length buffers hav caused very nasty, hard to chase down bugs at some
sites.
The strupper_m() function has a strupper_talloc() to replace it (we
need to go around and fix more uses, but it's a start). Use of these
new functions will avoid bugs where the upper or lowercase version of
a string is a different length.
I have removed the push_*_allocate functions, which are replaced by
calls to push_*_talloc. Likewise, pstring and other 'fixed length'
wrappers are removed, where possible.
I have removed the first ('base pointer') argument, used by push_ucs2,
as the Samba4 way of doing things ensures that this is always on an
even boundary anyway. (It was used in only one place, in any case).
(This used to be commit dfecb0150627b500cb026b8a4932fe87902ca392)
2004-09-23 04:51:45 +04:00
size_t src_len ;
ssize_t ret ;
char * tmpbuf = NULL ;
2003-08-13 05:53:07 +04:00
/* treat a pstring as "unlimited" length */
if ( dest_len = = ( size_t ) - 1 )
dest_len = sizeof ( pstring ) ;
if ( flags & STR_UPPER ) {
r2552: Character set conversion and string handling updates.
The intial motivation for this commit was to merge in some of the
bugfixes present in Samba3's chrcnv and string handling code into
Samba4. However, along the way I found a lot of unused functions, and
decided to do a bit more...
The strlen_m code now does not use a fixed buffer, but more work is
needed to finish off other functions in str_util.c. These fixed
length buffers hav caused very nasty, hard to chase down bugs at some
sites.
The strupper_m() function has a strupper_talloc() to replace it (we
need to go around and fix more uses, but it's a start). Use of these
new functions will avoid bugs where the upper or lowercase version of
a string is a different length.
I have removed the push_*_allocate functions, which are replaced by
calls to push_*_talloc. Likewise, pstring and other 'fixed length'
wrappers are removed, where possible.
I have removed the first ('base pointer') argument, used by push_ucs2,
as the Samba4 way of doing things ensures that this is always on an
even boundary anyway. (It was used in only one place, in any case).
(This used to be commit dfecb0150627b500cb026b8a4932fe87902ca392)
2004-09-23 04:51:45 +04:00
tmpbuf = strupper_talloc ( NULL , src ) ;
if ( ! tmpbuf ) {
return - 1 ;
}
2003-08-13 05:53:07 +04:00
src = tmpbuf ;
}
r2552: Character set conversion and string handling updates.
The intial motivation for this commit was to merge in some of the
bugfixes present in Samba3's chrcnv and string handling code into
Samba4. However, along the way I found a lot of unused functions, and
decided to do a bit more...
The strlen_m code now does not use a fixed buffer, but more work is
needed to finish off other functions in str_util.c. These fixed
length buffers hav caused very nasty, hard to chase down bugs at some
sites.
The strupper_m() function has a strupper_talloc() to replace it (we
need to go around and fix more uses, but it's a start). Use of these
new functions will avoid bugs where the upper or lowercase version of
a string is a different length.
I have removed the push_*_allocate functions, which are replaced by
calls to push_*_talloc. Likewise, pstring and other 'fixed length'
wrappers are removed, where possible.
I have removed the first ('base pointer') argument, used by push_ucs2,
as the Samba4 way of doing things ensures that this is always on an
even boundary anyway. (It was used in only one place, in any case).
(This used to be commit dfecb0150627b500cb026b8a4932fe87902ca392)
2004-09-23 04:51:45 +04:00
src_len = strlen ( src ) ;
2003-08-13 05:53:07 +04:00
if ( flags & ( STR_TERMINATE | STR_TERMINATE_ASCII ) )
src_len + + ;
r2552: Character set conversion and string handling updates.
The intial motivation for this commit was to merge in some of the
bugfixes present in Samba3's chrcnv and string handling code into
Samba4. However, along the way I found a lot of unused functions, and
decided to do a bit more...
The strlen_m code now does not use a fixed buffer, but more work is
needed to finish off other functions in str_util.c. These fixed
length buffers hav caused very nasty, hard to chase down bugs at some
sites.
The strupper_m() function has a strupper_talloc() to replace it (we
need to go around and fix more uses, but it's a start). Use of these
new functions will avoid bugs where the upper or lowercase version of
a string is a different length.
I have removed the push_*_allocate functions, which are replaced by
calls to push_*_talloc. Likewise, pstring and other 'fixed length'
wrappers are removed, where possible.
I have removed the first ('base pointer') argument, used by push_ucs2,
as the Samba4 way of doing things ensures that this is always on an
even boundary anyway. (It was used in only one place, in any case).
(This used to be commit dfecb0150627b500cb026b8a4932fe87902ca392)
2004-09-23 04:51:45 +04:00
ret = convert_string ( CH_UNIX , CH_DOS , src , src_len , dest , dest_len ) ;
talloc_free ( tmpbuf ) ;
return ret ;
2003-08-13 05:53:07 +04:00
}
r2552: Character set conversion and string handling updates.
The intial motivation for this commit was to merge in some of the
bugfixes present in Samba3's chrcnv and string handling code into
Samba4. However, along the way I found a lot of unused functions, and
decided to do a bit more...
The strlen_m code now does not use a fixed buffer, but more work is
needed to finish off other functions in str_util.c. These fixed
length buffers hav caused very nasty, hard to chase down bugs at some
sites.
The strupper_m() function has a strupper_talloc() to replace it (we
need to go around and fix more uses, but it's a start). Use of these
new functions will avoid bugs where the upper or lowercase version of
a string is a different length.
I have removed the push_*_allocate functions, which are replaced by
calls to push_*_talloc. Likewise, pstring and other 'fixed length'
wrappers are removed, where possible.
I have removed the first ('base pointer') argument, used by push_ucs2,
as the Samba4 way of doing things ensures that this is always on an
even boundary anyway. (It was used in only one place, in any case).
(This used to be commit dfecb0150627b500cb026b8a4932fe87902ca392)
2004-09-23 04:51:45 +04:00
/**
* Copy a string from a unix char * src to an ASCII destination ,
* allocating a buffer using talloc ( ) .
*
* @ param dest always set at least to NULL
*
* @ returns The number of bytes occupied by the string in the destination
* or - 1 in case of error .
* */
ssize_t push_ascii_talloc ( TALLOC_CTX * ctx , char * * dest , const char * src )
2003-08-13 05:53:07 +04:00
{
r2552: Character set conversion and string handling updates.
The intial motivation for this commit was to merge in some of the
bugfixes present in Samba3's chrcnv and string handling code into
Samba4. However, along the way I found a lot of unused functions, and
decided to do a bit more...
The strlen_m code now does not use a fixed buffer, but more work is
needed to finish off other functions in str_util.c. These fixed
length buffers hav caused very nasty, hard to chase down bugs at some
sites.
The strupper_m() function has a strupper_talloc() to replace it (we
need to go around and fix more uses, but it's a start). Use of these
new functions will avoid bugs where the upper or lowercase version of
a string is a different length.
I have removed the push_*_allocate functions, which are replaced by
calls to push_*_talloc. Likewise, pstring and other 'fixed length'
wrappers are removed, where possible.
I have removed the first ('base pointer') argument, used by push_ucs2,
as the Samba4 way of doing things ensures that this is always on an
even boundary anyway. (It was used in only one place, in any case).
(This used to be commit dfecb0150627b500cb026b8a4932fe87902ca392)
2004-09-23 04:51:45 +04:00
size_t src_len = strlen ( src ) + 1 ;
* dest = NULL ;
return convert_string_talloc ( ctx , CH_UNIX , CH_DOS , src , src_len , ( void * * ) dest ) ;
2003-08-13 05:53:07 +04:00
}
r2552: Character set conversion and string handling updates.
The intial motivation for this commit was to merge in some of the
bugfixes present in Samba3's chrcnv and string handling code into
Samba4. However, along the way I found a lot of unused functions, and
decided to do a bit more...
The strlen_m code now does not use a fixed buffer, but more work is
needed to finish off other functions in str_util.c. These fixed
length buffers hav caused very nasty, hard to chase down bugs at some
sites.
The strupper_m() function has a strupper_talloc() to replace it (we
need to go around and fix more uses, but it's a start). Use of these
new functions will avoid bugs where the upper or lowercase version of
a string is a different length.
I have removed the push_*_allocate functions, which are replaced by
calls to push_*_talloc. Likewise, pstring and other 'fixed length'
wrappers are removed, where possible.
I have removed the first ('base pointer') argument, used by push_ucs2,
as the Samba4 way of doing things ensures that this is always on an
even boundary anyway. (It was used in only one place, in any case).
(This used to be commit dfecb0150627b500cb026b8a4932fe87902ca392)
2004-09-23 04:51:45 +04:00
2003-08-13 05:53:07 +04:00
/**
* Copy a string from a dos codepage source to a unix char * destination .
*
* The resulting string in " dest " is always null terminated .
*
* @ param flags can have :
* < dl >
* < dt > STR_TERMINATE < / dt >
* < dd > STR_TERMINATE means the string in @ p src
* is null terminated , and src_len is ignored . < / dd >
* < / dl >
*
* @ param src_len is the length of the source area in bytes .
* @ returns the number of bytes occupied by the string in @ p src .
* */
ssize_t pull_ascii ( char * dest , const void * src , size_t dest_len , size_t src_len , int flags )
{
size_t ret ;
if ( dest_len = = ( size_t ) - 1 )
dest_len = sizeof ( pstring ) ;
2004-05-28 07:11:14 +04:00
if ( flags & ( STR_TERMINATE | STR_TERMINATE_ASCII ) ) {
2003-08-13 05:53:07 +04:00
if ( src_len = = ( size_t ) - 1 ) {
src_len = strlen ( src ) + 1 ;
} else {
size_t len = strnlen ( src , src_len ) ;
if ( len < src_len )
len + + ;
src_len = len ;
}
}
ret = convert_string ( CH_DOS , CH_UNIX , src , src_len , dest , dest_len ) ;
if ( dest_len )
dest [ MIN ( ret , dest_len - 1 ) ] = 0 ;
return src_len ;
}
/**
* Copy a string from a char * src to a unicode destination .
*
* @ returns the number of bytes occupied by the string in the destination .
*
* @ param flags can have :
*
* < dl >
* < dt > STR_TERMINATE < dd > means include the null termination .
* < dt > STR_UPPER < dd > means uppercase in the destination .
* < dt > STR_NOALIGN < dd > means don ' t do alignment .
* < / dl >
*
* @ param dest_len is the maximum length allowed in the
* destination . If dest_len is - 1 then no maxiumum is used .
* */
r2552: Character set conversion and string handling updates.
The intial motivation for this commit was to merge in some of the
bugfixes present in Samba3's chrcnv and string handling code into
Samba4. However, along the way I found a lot of unused functions, and
decided to do a bit more...
The strlen_m code now does not use a fixed buffer, but more work is
needed to finish off other functions in str_util.c. These fixed
length buffers hav caused very nasty, hard to chase down bugs at some
sites.
The strupper_m() function has a strupper_talloc() to replace it (we
need to go around and fix more uses, but it's a start). Use of these
new functions will avoid bugs where the upper or lowercase version of
a string is a different length.
I have removed the push_*_allocate functions, which are replaced by
calls to push_*_talloc. Likewise, pstring and other 'fixed length'
wrappers are removed, where possible.
I have removed the first ('base pointer') argument, used by push_ucs2,
as the Samba4 way of doing things ensures that this is always on an
even boundary anyway. (It was used in only one place, in any case).
(This used to be commit dfecb0150627b500cb026b8a4932fe87902ca392)
2004-09-23 04:51:45 +04:00
ssize_t push_ucs2 ( void * dest , const char * src , size_t dest_len , int flags )
2003-08-13 05:53:07 +04:00
{
size_t len = 0 ;
size_t src_len = strlen ( src ) ;
r2552: Character set conversion and string handling updates.
The intial motivation for this commit was to merge in some of the
bugfixes present in Samba3's chrcnv and string handling code into
Samba4. However, along the way I found a lot of unused functions, and
decided to do a bit more...
The strlen_m code now does not use a fixed buffer, but more work is
needed to finish off other functions in str_util.c. These fixed
length buffers hav caused very nasty, hard to chase down bugs at some
sites.
The strupper_m() function has a strupper_talloc() to replace it (we
need to go around and fix more uses, but it's a start). Use of these
new functions will avoid bugs where the upper or lowercase version of
a string is a different length.
I have removed the push_*_allocate functions, which are replaced by
calls to push_*_talloc. Likewise, pstring and other 'fixed length'
wrappers are removed, where possible.
I have removed the first ('base pointer') argument, used by push_ucs2,
as the Samba4 way of doing things ensures that this is always on an
even boundary anyway. (It was used in only one place, in any case).
(This used to be commit dfecb0150627b500cb026b8a4932fe87902ca392)
2004-09-23 04:51:45 +04:00
size_t ret ;
2003-08-13 05:53:07 +04:00
/* treat a pstring as "unlimited" length */
if ( dest_len = = ( size_t ) - 1 )
dest_len = sizeof ( pstring ) ;
if ( flags & STR_TERMINATE )
src_len + + ;
r2552: Character set conversion and string handling updates.
The intial motivation for this commit was to merge in some of the
bugfixes present in Samba3's chrcnv and string handling code into
Samba4. However, along the way I found a lot of unused functions, and
decided to do a bit more...
The strlen_m code now does not use a fixed buffer, but more work is
needed to finish off other functions in str_util.c. These fixed
length buffers hav caused very nasty, hard to chase down bugs at some
sites.
The strupper_m() function has a strupper_talloc() to replace it (we
need to go around and fix more uses, but it's a start). Use of these
new functions will avoid bugs where the upper or lowercase version of
a string is a different length.
I have removed the push_*_allocate functions, which are replaced by
calls to push_*_talloc. Likewise, pstring and other 'fixed length'
wrappers are removed, where possible.
I have removed the first ('base pointer') argument, used by push_ucs2,
as the Samba4 way of doing things ensures that this is always on an
even boundary anyway. (It was used in only one place, in any case).
(This used to be commit dfecb0150627b500cb026b8a4932fe87902ca392)
2004-09-23 04:51:45 +04:00
if ( ucs2_align ( NULL , dest , flags ) ) {
2003-08-13 05:53:07 +04:00
* ( char * ) dest = 0 ;
dest = ( void * ) ( ( char * ) dest + 1 ) ;
if ( dest_len ) dest_len - - ;
len + + ;
}
/* ucs2 is always a multiple of 2 bytes */
dest_len & = ~ 1 ;
r2552: Character set conversion and string handling updates.
The intial motivation for this commit was to merge in some of the
bugfixes present in Samba3's chrcnv and string handling code into
Samba4. However, along the way I found a lot of unused functions, and
decided to do a bit more...
The strlen_m code now does not use a fixed buffer, but more work is
needed to finish off other functions in str_util.c. These fixed
length buffers hav caused very nasty, hard to chase down bugs at some
sites.
The strupper_m() function has a strupper_talloc() to replace it (we
need to go around and fix more uses, but it's a start). Use of these
new functions will avoid bugs where the upper or lowercase version of
a string is a different length.
I have removed the push_*_allocate functions, which are replaced by
calls to push_*_talloc. Likewise, pstring and other 'fixed length'
wrappers are removed, where possible.
I have removed the first ('base pointer') argument, used by push_ucs2,
as the Samba4 way of doing things ensures that this is always on an
even boundary anyway. (It was used in only one place, in any case).
(This used to be commit dfecb0150627b500cb026b8a4932fe87902ca392)
2004-09-23 04:51:45 +04:00
ret = convert_string ( CH_UNIX , CH_UTF16 , src , src_len , dest , dest_len ) ;
if ( ret = = ( size_t ) - 1 ) {
return 0 ;
}
len + = ret ;
if ( flags & STR_UPPER ) {
smb_ucs2_t * dest_ucs2 = dest ;
size_t i ;
for ( i = 0 ; i < ( dest_len / 2 ) & & dest_ucs2 [ i ] ; i + + ) {
smb_ucs2_t v = toupper_w ( dest_ucs2 [ i ] ) ;
if ( v ! = dest_ucs2 [ i ] ) {
dest_ucs2 [ i ] = v ;
}
}
}
2003-08-13 05:53:07 +04:00
return len ;
}
/**
* Copy a string from a unix char * src to a UCS2 destination ,
* allocating a buffer using talloc ( ) .
*
* @ param dest always set at least to NULL
*
* @ returns The number of bytes occupied by the string in the destination
* or - 1 in case of error .
* */
ssize_t push_ucs2_talloc ( TALLOC_CTX * ctx , smb_ucs2_t * * dest , const char * src )
{
size_t src_len = strlen ( src ) + 1 ;
* dest = NULL ;
r2552: Character set conversion and string handling updates.
The intial motivation for this commit was to merge in some of the
bugfixes present in Samba3's chrcnv and string handling code into
Samba4. However, along the way I found a lot of unused functions, and
decided to do a bit more...
The strlen_m code now does not use a fixed buffer, but more work is
needed to finish off other functions in str_util.c. These fixed
length buffers hav caused very nasty, hard to chase down bugs at some
sites.
The strupper_m() function has a strupper_talloc() to replace it (we
need to go around and fix more uses, but it's a start). Use of these
new functions will avoid bugs where the upper or lowercase version of
a string is a different length.
I have removed the push_*_allocate functions, which are replaced by
calls to push_*_talloc. Likewise, pstring and other 'fixed length'
wrappers are removed, where possible.
I have removed the first ('base pointer') argument, used by push_ucs2,
as the Samba4 way of doing things ensures that this is always on an
even boundary anyway. (It was used in only one place, in any case).
(This used to be commit dfecb0150627b500cb026b8a4932fe87902ca392)
2004-09-23 04:51:45 +04:00
return convert_string_talloc ( ctx , CH_UNIX , CH_UTF16 , src , src_len , ( void * * ) dest ) ;
2003-08-13 05:53:07 +04:00
}
/**
* 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
*
* @ returns The number of bytes occupied by the string in the destination
* */
ssize_t push_utf8_talloc ( TALLOC_CTX * ctx , char * * dest , const char * src )
{
size_t src_len = strlen ( src ) + 1 ;
* dest = NULL ;
r2552: Character set conversion and string handling updates.
The intial motivation for this commit was to merge in some of the
bugfixes present in Samba3's chrcnv and string handling code into
Samba4. However, along the way I found a lot of unused functions, and
decided to do a bit more...
The strlen_m code now does not use a fixed buffer, but more work is
needed to finish off other functions in str_util.c. These fixed
length buffers hav caused very nasty, hard to chase down bugs at some
sites.
The strupper_m() function has a strupper_talloc() to replace it (we
need to go around and fix more uses, but it's a start). Use of these
new functions will avoid bugs where the upper or lowercase version of
a string is a different length.
I have removed the push_*_allocate functions, which are replaced by
calls to push_*_talloc. Likewise, pstring and other 'fixed length'
wrappers are removed, where possible.
I have removed the first ('base pointer') argument, used by push_ucs2,
as the Samba4 way of doing things ensures that this is always on an
even boundary anyway. (It was used in only one place, in any case).
(This used to be commit dfecb0150627b500cb026b8a4932fe87902ca392)
2004-09-23 04:51:45 +04:00
return convert_string_talloc ( ctx , CH_UNIX , CH_UTF8 , src , src_len , ( void * * ) dest ) ;
2003-08-13 05:53:07 +04:00
}
/**
Copy a string from a ucs2 source to a unix char * destination .
Flags can have :
STR_TERMINATE means the string in src is null terminated .
STR_NOALIGN means don ' t try to align .
if STR_TERMINATE is set then src_len is ignored if it is - 1.
src_len is the length of the source area in bytes
Return the number of bytes occupied by the string in src .
The resulting string in " dest " is always null terminated .
* */
r2552: Character set conversion and string handling updates.
The intial motivation for this commit was to merge in some of the
bugfixes present in Samba3's chrcnv and string handling code into
Samba4. However, along the way I found a lot of unused functions, and
decided to do a bit more...
The strlen_m code now does not use a fixed buffer, but more work is
needed to finish off other functions in str_util.c. These fixed
length buffers hav caused very nasty, hard to chase down bugs at some
sites.
The strupper_m() function has a strupper_talloc() to replace it (we
need to go around and fix more uses, but it's a start). Use of these
new functions will avoid bugs where the upper or lowercase version of
a string is a different length.
I have removed the push_*_allocate functions, which are replaced by
calls to push_*_talloc. Likewise, pstring and other 'fixed length'
wrappers are removed, where possible.
I have removed the first ('base pointer') argument, used by push_ucs2,
as the Samba4 way of doing things ensures that this is always on an
even boundary anyway. (It was used in only one place, in any case).
(This used to be commit dfecb0150627b500cb026b8a4932fe87902ca392)
2004-09-23 04:51:45 +04:00
size_t pull_ucs2 ( char * dest , const void * src , size_t dest_len , size_t src_len , int flags )
2003-08-13 05:53:07 +04:00
{
size_t ret ;
if ( dest_len = = ( size_t ) - 1 )
dest_len = sizeof ( pstring ) ;
r2552: Character set conversion and string handling updates.
The intial motivation for this commit was to merge in some of the
bugfixes present in Samba3's chrcnv and string handling code into
Samba4. However, along the way I found a lot of unused functions, and
decided to do a bit more...
The strlen_m code now does not use a fixed buffer, but more work is
needed to finish off other functions in str_util.c. These fixed
length buffers hav caused very nasty, hard to chase down bugs at some
sites.
The strupper_m() function has a strupper_talloc() to replace it (we
need to go around and fix more uses, but it's a start). Use of these
new functions will avoid bugs where the upper or lowercase version of
a string is a different length.
I have removed the push_*_allocate functions, which are replaced by
calls to push_*_talloc. Likewise, pstring and other 'fixed length'
wrappers are removed, where possible.
I have removed the first ('base pointer') argument, used by push_ucs2,
as the Samba4 way of doing things ensures that this is always on an
even boundary anyway. (It was used in only one place, in any case).
(This used to be commit dfecb0150627b500cb026b8a4932fe87902ca392)
2004-09-23 04:51:45 +04:00
if ( ucs2_align ( NULL , src , flags ) ) {
2003-08-13 05:53:07 +04:00
src = ( const void * ) ( ( const char * ) src + 1 ) ;
if ( src_len > 0 )
src_len - - ;
}
if ( flags & STR_TERMINATE ) {
if ( src_len = = ( size_t ) - 1 ) {
src_len = strlen_w ( src ) * 2 + 2 ;
} else {
size_t len = strnlen_w ( src , src_len / 2 ) ;
if ( len < src_len / 2 )
len + + ;
src_len = len * 2 ;
}
}
/* ucs2 is always a multiple of 2 bytes */
if ( src_len ! = ( size_t ) - 1 )
src_len & = ~ 1 ;
2004-09-01 08:39:06 +04:00
ret = convert_string ( CH_UTF16 , CH_UNIX , src , src_len , dest , dest_len ) ;
2003-08-13 05:53:07 +04:00
if ( dest_len )
dest [ MIN ( ret , dest_len - 1 ) ] = 0 ;
return src_len ;
}
ssize_t pull_ucs2_pstring ( char * dest , const void * src )
{
r2552: Character set conversion and string handling updates.
The intial motivation for this commit was to merge in some of the
bugfixes present in Samba3's chrcnv and string handling code into
Samba4. However, along the way I found a lot of unused functions, and
decided to do a bit more...
The strlen_m code now does not use a fixed buffer, but more work is
needed to finish off other functions in str_util.c. These fixed
length buffers hav caused very nasty, hard to chase down bugs at some
sites.
The strupper_m() function has a strupper_talloc() to replace it (we
need to go around and fix more uses, but it's a start). Use of these
new functions will avoid bugs where the upper or lowercase version of
a string is a different length.
I have removed the push_*_allocate functions, which are replaced by
calls to push_*_talloc. Likewise, pstring and other 'fixed length'
wrappers are removed, where possible.
I have removed the first ('base pointer') argument, used by push_ucs2,
as the Samba4 way of doing things ensures that this is always on an
even boundary anyway. (It was used in only one place, in any case).
(This used to be commit dfecb0150627b500cb026b8a4932fe87902ca392)
2004-09-23 04:51:45 +04:00
return pull_ucs2 ( dest , src , sizeof ( pstring ) , - 1 , STR_TERMINATE ) ;
2003-08-13 05:53:07 +04:00
}
/**
* Copy a string from a UCS2 src to a unix char * destination , allocating a buffer using talloc
*
* @ param dest always set at least to NULL
*
* @ returns The number of bytes occupied by the string in the destination
* */
ssize_t pull_ucs2_talloc ( TALLOC_CTX * ctx , char * * dest , const smb_ucs2_t * src )
{
size_t src_len = ( strlen_w ( src ) + 1 ) * sizeof ( smb_ucs2_t ) ;
* dest = NULL ;
r2552: Character set conversion and string handling updates.
The intial motivation for this commit was to merge in some of the
bugfixes present in Samba3's chrcnv and string handling code into
Samba4. However, along the way I found a lot of unused functions, and
decided to do a bit more...
The strlen_m code now does not use a fixed buffer, but more work is
needed to finish off other functions in str_util.c. These fixed
length buffers hav caused very nasty, hard to chase down bugs at some
sites.
The strupper_m() function has a strupper_talloc() to replace it (we
need to go around and fix more uses, but it's a start). Use of these
new functions will avoid bugs where the upper or lowercase version of
a string is a different length.
I have removed the push_*_allocate functions, which are replaced by
calls to push_*_talloc. Likewise, pstring and other 'fixed length'
wrappers are removed, where possible.
I have removed the first ('base pointer') argument, used by push_ucs2,
as the Samba4 way of doing things ensures that this is always on an
even boundary anyway. (It was used in only one place, in any case).
(This used to be commit dfecb0150627b500cb026b8a4932fe87902ca392)
2004-09-23 04:51:45 +04:00
return convert_string_talloc ( ctx , CH_UTF16 , CH_UNIX , src , src_len , ( void * * ) dest ) ;
2003-08-13 05:53:07 +04:00
}
/**
* Copy a string from a UTF - 8 src to a unix char * destination , allocating a buffer using talloc
*
* @ param dest always set at least to NULL
*
* @ returns The number of bytes occupied by the string in the destination
* */
ssize_t pull_utf8_talloc ( TALLOC_CTX * ctx , char * * dest , const char * src )
{
size_t src_len = strlen ( src ) + 1 ;
* dest = NULL ;
r2552: Character set conversion and string handling updates.
The intial motivation for this commit was to merge in some of the
bugfixes present in Samba3's chrcnv and string handling code into
Samba4. However, along the way I found a lot of unused functions, and
decided to do a bit more...
The strlen_m code now does not use a fixed buffer, but more work is
needed to finish off other functions in str_util.c. These fixed
length buffers hav caused very nasty, hard to chase down bugs at some
sites.
The strupper_m() function has a strupper_talloc() to replace it (we
need to go around and fix more uses, but it's a start). Use of these
new functions will avoid bugs where the upper or lowercase version of
a string is a different length.
I have removed the push_*_allocate functions, which are replaced by
calls to push_*_talloc. Likewise, pstring and other 'fixed length'
wrappers are removed, where possible.
I have removed the first ('base pointer') argument, used by push_ucs2,
as the Samba4 way of doing things ensures that this is always on an
even boundary anyway. (It was used in only one place, in any case).
(This used to be commit dfecb0150627b500cb026b8a4932fe87902ca392)
2004-09-23 04:51:45 +04:00
return convert_string_talloc ( ctx , CH_UTF8 , CH_UNIX , src , src_len , ( void * * ) dest ) ;
2003-08-13 05:53:07 +04:00
}
/**
Copy a string from a char * src to a unicode or ascii
dos codepage destination choosing unicode or ascii based on the
flags in the SMB buffer starting at base_ptr .
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 .
STR_ASCII use ascii even with unicode packet .
STR_NOALIGN means don ' t do alignment .
dest_len is the maximum length allowed in the destination . If dest_len
is - 1 then no maxiumum is used .
* */
r2552: Character set conversion and string handling updates.
The intial motivation for this commit was to merge in some of the
bugfixes present in Samba3's chrcnv and string handling code into
Samba4. However, along the way I found a lot of unused functions, and
decided to do a bit more...
The strlen_m code now does not use a fixed buffer, but more work is
needed to finish off other functions in str_util.c. These fixed
length buffers hav caused very nasty, hard to chase down bugs at some
sites.
The strupper_m() function has a strupper_talloc() to replace it (we
need to go around and fix more uses, but it's a start). Use of these
new functions will avoid bugs where the upper or lowercase version of
a string is a different length.
I have removed the push_*_allocate functions, which are replaced by
calls to push_*_talloc. Likewise, pstring and other 'fixed length'
wrappers are removed, where possible.
I have removed the first ('base pointer') argument, used by push_ucs2,
as the Samba4 way of doing things ensures that this is always on an
even boundary anyway. (It was used in only one place, in any case).
(This used to be commit dfecb0150627b500cb026b8a4932fe87902ca392)
2004-09-23 04:51:45 +04:00
ssize_t push_string ( void * dest , const char * src , size_t dest_len , int flags )
2003-08-13 05:53:07 +04:00
{
r2552: Character set conversion and string handling updates.
The intial motivation for this commit was to merge in some of the
bugfixes present in Samba3's chrcnv and string handling code into
Samba4. However, along the way I found a lot of unused functions, and
decided to do a bit more...
The strlen_m code now does not use a fixed buffer, but more work is
needed to finish off other functions in str_util.c. These fixed
length buffers hav caused very nasty, hard to chase down bugs at some
sites.
The strupper_m() function has a strupper_talloc() to replace it (we
need to go around and fix more uses, but it's a start). Use of these
new functions will avoid bugs where the upper or lowercase version of
a string is a different length.
I have removed the push_*_allocate functions, which are replaced by
calls to push_*_talloc. Likewise, pstring and other 'fixed length'
wrappers are removed, where possible.
I have removed the first ('base pointer') argument, used by push_ucs2,
as the Samba4 way of doing things ensures that this is always on an
even boundary anyway. (It was used in only one place, in any case).
(This used to be commit dfecb0150627b500cb026b8a4932fe87902ca392)
2004-09-23 04:51:45 +04:00
if ( flags & STR_ASCII ) {
return push_ascii ( dest , src , dest_len , flags ) ;
} else if ( flags & STR_UNICODE ) {
return push_ucs2 ( dest , src , dest_len , flags ) ;
} else {
smb_panic ( " push_string requires either STR_ASCII or STR_UNICODE flag to be set " ) ;
return - 1 ;
2003-08-13 05:53:07 +04:00
}
}
/**
Copy a string from a unicode or ascii source ( depending on
the packet flags ) to a char * destination .
Flags can have :
STR_TERMINATE means the string in src is null terminated .
STR_UNICODE means to force as unicode .
STR_ASCII use ascii even with unicode packet .
STR_NOALIGN means don ' t do alignment .
if STR_TERMINATE is set then src_len is ignored is it is - 1
src_len is the length of the source area in bytes .
Return the number of bytes occupied by the string in src .
The resulting string in " dest " is always null terminated .
* */
r2552: Character set conversion and string handling updates.
The intial motivation for this commit was to merge in some of the
bugfixes present in Samba3's chrcnv and string handling code into
Samba4. However, along the way I found a lot of unused functions, and
decided to do a bit more...
The strlen_m code now does not use a fixed buffer, but more work is
needed to finish off other functions in str_util.c. These fixed
length buffers hav caused very nasty, hard to chase down bugs at some
sites.
The strupper_m() function has a strupper_talloc() to replace it (we
need to go around and fix more uses, but it's a start). Use of these
new functions will avoid bugs where the upper or lowercase version of
a string is a different length.
I have removed the push_*_allocate functions, which are replaced by
calls to push_*_talloc. Likewise, pstring and other 'fixed length'
wrappers are removed, where possible.
I have removed the first ('base pointer') argument, used by push_ucs2,
as the Samba4 way of doing things ensures that this is always on an
even boundary anyway. (It was used in only one place, in any case).
(This used to be commit dfecb0150627b500cb026b8a4932fe87902ca392)
2004-09-23 04:51:45 +04:00
ssize_t pull_string ( char * dest , const void * src , size_t dest_len , size_t src_len , int flags )
2003-08-13 05:53:07 +04:00
{
r2552: Character set conversion and string handling updates.
The intial motivation for this commit was to merge in some of the
bugfixes present in Samba3's chrcnv and string handling code into
Samba4. However, along the way I found a lot of unused functions, and
decided to do a bit more...
The strlen_m code now does not use a fixed buffer, but more work is
needed to finish off other functions in str_util.c. These fixed
length buffers hav caused very nasty, hard to chase down bugs at some
sites.
The strupper_m() function has a strupper_talloc() to replace it (we
need to go around and fix more uses, but it's a start). Use of these
new functions will avoid bugs where the upper or lowercase version of
a string is a different length.
I have removed the push_*_allocate functions, which are replaced by
calls to push_*_talloc. Likewise, pstring and other 'fixed length'
wrappers are removed, where possible.
I have removed the first ('base pointer') argument, used by push_ucs2,
as the Samba4 way of doing things ensures that this is always on an
even boundary anyway. (It was used in only one place, in any case).
(This used to be commit dfecb0150627b500cb026b8a4932fe87902ca392)
2004-09-23 04:51:45 +04:00
if ( flags & STR_ASCII ) {
return pull_ascii ( dest , src , dest_len , src_len , flags ) ;
} else if ( flags & STR_UNICODE ) {
return pull_ucs2 ( dest , src , dest_len , src_len , flags ) ;
} else {
smb_panic ( " pull_string requires either STR_ASCII or STR_UNICODE flag to be set " ) ;
return - 1 ;
2003-08-13 05:53:07 +04:00
}
}