summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>2011-03-24 15:59:26 +1100
committerAndrew Tridgell <tridge@samba.org>2011-03-25 04:37:06 +0100
commit2643a7ba6b87d0378323237e143ce128dfc09837 (patch)
tree6d3d2dd182df63d9616041f3d095821af5acbf26
parent37261928bec145f4cbd85f3e409063563c00ac9e (diff)
downloadsamba-2643a7ba6b87d0378323237e143ce128dfc09837.tar.gz
samba-2643a7ba6b87d0378323237e143ce128dfc09837.tar.bz2
samba-2643a7ba6b87d0378323237e143ce128dfc09837.zip
charcnv: added convert_string_error()
this will allow us to remove conv_silent Pair-Programmed-With: Andrew Bartlett <abartlet@samba.org>
-rw-r--r--lib/util/charset/charcnv.c90
1 files changed, 57 insertions, 33 deletions
diff --git a/lib/util/charset/charcnv.c b/lib/util/charset/charcnv.c
index 5489cf7391..88f464c2c2 100644
--- a/lib/util/charset/charcnv.c
+++ b/lib/util/charset/charcnv.c
@@ -122,14 +122,15 @@ convert:
* @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
+ * on error, returns -1, and sets errno
**/
-_PUBLIC_ bool convert_string_convenience(struct smb_iconv_convenience *ic,
- charset_t from, charset_t to,
- void const *src, size_t srclen,
- void *dest, size_t destlen, size_t *converted_size)
+_PUBLIC_ ssize_t convert_string_error(struct smb_iconv_convenience *ic,
+ charset_t from, charset_t to,
+ void const *src, size_t srclen,
+ void *dest, size_t destlen, size_t *converted_size)
{
size_t i_len, o_len;
- size_t retval;
+ ssize_t retval;
const char* inbuf = (const char*)src;
char* outbuf = (char*)dest;
smb_iconv_t descriptor;
@@ -138,45 +139,68 @@ _PUBLIC_ bool convert_string_convenience(struct smb_iconv_convenience *ic,
srclen = strlen(inbuf)+1;
descriptor = get_conv_handle(ic, from, to);
-
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);
- *converted_size = len;
- return true;
+ if (converted_size) {
+ *converted_size = 0;
+ }
+ errno = EINVAL;
+ return -1;
}
i_len=srclen;
o_len=destlen;
+
retval = smb_iconv(descriptor, &inbuf, &i_len, &outbuf, &o_len);
+
+ if (converted_size != NULL)
+ *converted_size = destlen-o_len;
+ return retval;
+}
+
+
+/**
+ * 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
+ **/
+_PUBLIC_ bool convert_string_convenience(struct smb_iconv_convenience *ic,
+ charset_t from, charset_t to,
+ void const *src, size_t srclen,
+ void *dest, size_t destlen, size_t *converted_size)
+{
+ ssize_t retval;
+
+ retval = convert_string_error(ic, from, to, src, srclen, dest, destlen, converted_size);
if(retval==(size_t)-1) {
const char *reason;
switch(errno) {
- case EINVAL:
- reason="Incomplete multibyte sequence";
- return false;
- case E2BIG:
- reason="No more room";
- if (from == CH_UNIX) {
- DEBUG(0,("E2BIG: convert_string(%s,%s): srclen=%d destlen=%d - '%s'\n",
- charset_name(ic, from), charset_name(ic, to),
- (int)srclen, (int)destlen,
- (const char *)src));
- } else {
- DEBUG(0,("E2BIG: convert_string(%s,%s): srclen=%d destlen=%d\n",
- charset_name(ic, from), charset_name(ic, to),
- (int)srclen, (int)destlen));
- }
- return false;
- case EILSEQ:
- reason="Illegal multibyte sequence";
- return false;
+ case EINVAL:
+ reason="Incomplete multibyte sequence";
+ return false;
+ case E2BIG:
+ reason="No more room";
+ if (from == CH_UNIX) {
+ DEBUG(0,("E2BIG: convert_string(%s,%s): srclen=%d destlen=%d - '%s'\n",
+ charset_name(ic, from), charset_name(ic, to),
+ (int)srclen, (int)destlen,
+ (const char *)src));
+ } else {
+ DEBUG(0,("E2BIG: convert_string(%s,%s): srclen=%d destlen=%d\n",
+ charset_name(ic, from), charset_name(ic, to),
+ (int)srclen, (int)destlen));
+ }
+ return false;
+ case EILSEQ:
+ reason="Illegal multibyte sequence";
+ return false;
+ default:
+ return false;
}
- /* smb_panic(reason); */
}
- if (converted_size != NULL)
- *converted_size = destlen-o_len;
return true;
}