search for: eca2343

...) - return NULL; - memcpy (ret, nk->name, len); - ret[len] = '\0'; - return ret; + return _hivex_windows_latin1_to_utf8 (nk->name, len); } else { return _hivex_windows_utf16_to_utf8 (nk->name, len); } diff --git a/lib/utf16.c b/lib/utf16.c index 844715c..eca2343 100644 --- a/lib/utf16.c +++ b/lib/utf16.c @@ -29,15 +29,14 @@ #include "hivex-internal.h" char * -_hivex_windows_utf16_to_utf8 (/* const */ char *input, size_t len) +_hivex_to_utf8 (/* const */ char *input, size_t len, char* input_encoding) { - iconv_t ic = iconv_open ("UTF-8&...

...1_to_utf8(_input, _len) \ - _hivex_to_utf8 (_input, _len, "LATIN1") + _hivex_recode ("LATIN1", _input, _len, "UTF-8", NULL) extern size_t _hivex_utf16_string_len_in_bytes_max (const char *str, size_t len); /* util.c */ diff --git a/lib/utf16.c b/lib/utf16.c index eca2343..6b8bf9a 100644 --- a/lib/utf16.c +++ b/lib/utf16.c @@ -29,18 +29,19 @@ #include "hivex-internal.h" char * -_hivex_to_utf8 (/* const */ char *input, size_t len, char* input_encoding) +_hivex_recode (char *input_encoding, const char *input, size_t input_len, + char *outpu...

--- lib/hivex-internal.h | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/lib/hivex-internal.h b/lib/hivex-internal.h index f391b98..d7ce339 100644 --- a/lib/hivex-internal.h +++ b/lib/hivex-internal.h @@ -125,7 +125,19 @@ struct ntreg_hbin_block { struct ntreg_nk_record { int32_t seg_len; /* length (always -ve because used) */ char id[2];