X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=gdb%2Fcharset.c;h=fcb24a488239b57ef022c1b0c5d6971b8476584d;hb=a14c4daab2fe90612e63169425e74098e74d5f28;hp=3e4ed470c5c35c1faba11ed58d19674cef27bc75;hpb=ecd75fc8eed3bde86036141228074a20e55dcfc9;p=deliverable%2Fbinutils-gdb.git diff --git a/gdb/charset.c b/gdb/charset.c index 3e4ed470c5..fcb24a4882 100644 --- a/gdb/charset.c +++ b/gdb/charset.c @@ -1,6 +1,6 @@ /* Character set conversion support for GDB. - Copyright (C) 2001-2014 Free Software Foundation, Inc. + Copyright (C) 2001-2018 Free Software Foundation, Inc. This file is part of GDB. @@ -20,7 +20,6 @@ #include "defs.h" #include "charset.h" #include "gdbcmd.h" -#include "gdb_assert.h" #include "gdb_obstack.h" #include "gdb_wait.h" #include "charset-list.h" @@ -28,9 +27,6 @@ #include "environ.h" #include "arch-utils.h" #include "gdb_vecs.h" - -#include -#include #include #ifdef USE_WIN32API @@ -81,9 +77,13 @@ arrange for there to be a single available character set. */ #undef GDB_DEFAULT_HOST_CHARSET -#define GDB_DEFAULT_HOST_CHARSET "ISO-8859-1" -#define GDB_DEFAULT_TARGET_CHARSET "ISO-8859-1" -#define GDB_DEFAULT_TARGET_WIDE_CHARSET "ISO-8859-1" +#ifdef USE_WIN32API +# define GDB_DEFAULT_HOST_CHARSET "CP1252" +#else +# define GDB_DEFAULT_HOST_CHARSET "ISO-8859-1" +#endif +#define GDB_DEFAULT_TARGET_CHARSET GDB_DEFAULT_HOST_CHARSET +#define GDB_DEFAULT_TARGET_WIDE_CHARSET "UTF-32" #undef DEFAULT_CHARSET_NAMES #define DEFAULT_CHARSET_NAMES GDB_DEFAULT_HOST_CHARSET , @@ -99,29 +99,27 @@ #undef ICONV_CONST #define ICONV_CONST const -/* Some systems don't have EILSEQ, so we define it here, but not as - EINVAL, because callers of `iconv' want to distinguish EINVAL and - EILSEQ. This is what iconv.h from libiconv does as well. Note - that wchar.h may also define EILSEQ, so this needs to be after we - include wchar.h, which happens in defs.h through gdb_wchar.h. */ -#ifndef EILSEQ -#define EILSEQ ENOENT -#endif +/* We allow conversions from UTF-32, wchar_t, and the host charset. + We allow conversions to wchar_t and the host charset. + Return 1 if we are converting from UTF-32BE, 2 if from UTF32-LE, + 0 otherwise. This is used as a flag in calls to iconv. */ static iconv_t phony_iconv_open (const char *to, const char *from) { - /* We allow conversions from UTF-32BE, wchar_t, and the host charset. - We allow conversions to wchar_t and the host charset. */ - if (strcmp (from, "UTF-32BE") && strcmp (from, "wchar_t") - && strcmp (from, GDB_DEFAULT_HOST_CHARSET)) - return -1; if (strcmp (to, "wchar_t") && strcmp (to, GDB_DEFAULT_HOST_CHARSET)) return -1; - /* Return 1 if we are converting from UTF-32BE, 0 otherwise. This is - used as a flag in calls to iconv. */ - return !strcmp (from, "UTF-32BE"); + if (!strcmp (from, "UTF-32BE") || !strcmp (from, "UTF-32")) + return 1; + + if (!strcmp (from, "UTF-32LE")) + return 2; + + if (strcmp (from, "wchar_t") && strcmp (from, GDB_DEFAULT_HOST_CHARSET)) + return -1; + + return 0; } static int @@ -136,31 +134,33 @@ phony_iconv (iconv_t utf_flag, const char **inbuf, size_t *inbytesleft, { if (utf_flag) { + enum bfd_endian endian + = utf_flag == 1 ? BFD_ENDIAN_BIG : BFD_ENDIAN_LITTLE; while (*inbytesleft >= 4) { - size_t j; - unsigned long c = 0; - - for (j = 0; j < 4; ++j) - { - c <<= 8; - c += (*inbuf)[j] & 0xff; - } + unsigned long c + = extract_unsigned_integer ((const gdb_byte *)*inbuf, 4, endian); if (c >= 256) { errno = EILSEQ; return -1; } + if (*outbytesleft < 1) + { + errno = E2BIG; + return -1; + } **outbuf = c & 0xff; ++*outbuf; --*outbytesleft; - ++*inbuf; + *inbuf += 4; *inbytesleft -= 4; } - if (*inbytesleft < 4) + if (*inbytesleft) { + /* Partial sequence on input. */ errno = EINVAL; return -1; } @@ -178,12 +178,11 @@ phony_iconv (iconv_t utf_flag, const char **inbuf, size_t *inbytesleft, *outbuf += amt; *inbytesleft -= amt; *outbytesleft -= amt; - } - - if (*inbytesleft) - { - errno = E2BIG; - return -1; + if (*inbytesleft) + { + errno = E2BIG; + return -1; + } } /* The number of non-reversible conversions -- but they were all @@ -191,8 +190,28 @@ phony_iconv (iconv_t utf_flag, const char **inbuf, size_t *inbytesleft, return 0; } -#endif +#else /* PHONY_ICONV */ +/* On systems that don't have EILSEQ, GNU iconv's iconv.h defines it + to ENOENT, while gnulib defines it to a different value. Always + map ENOENT to gnulib's EILSEQ, leaving callers agnostic. */ + +static size_t +gdb_iconv (iconv_t utf_flag, ICONV_CONST char **inbuf, size_t *inbytesleft, + char **outbuf, size_t *outbytesleft) +{ + size_t ret; + + ret = iconv (utf_flag, inbuf, inbytesleft, outbuf, outbytesleft); + if (errno == ENOENT) + errno = EILSEQ; + return ret; +} + +#undef iconv +#define iconv gdb_iconv + +#endif /* PHONY_ICONV */ /* The global lists of character sets and translations. */ @@ -283,6 +302,11 @@ set_be_le_names (struct gdbarch *gdbarch) return; be_le_arch = gdbarch; +#ifdef PHONY_ICONV + /* Match the wide charset names recognized by phony_iconv_open. */ + target_wide_charset_le_name = "UTF-32LE"; + target_wide_charset_be_name = "UTF-32BE"; +#else target_wide_charset_le_name = NULL; target_wide_charset_be_name = NULL; @@ -306,6 +330,7 @@ set_be_le_names (struct gdbarch *gdbarch) target_wide_charset_le_name = charset_enum[i]; } } +# endif /* PHONY_ICONV */ } /* 'Set charset', 'set host-charset', 'set target-charset', 'set @@ -340,7 +365,7 @@ validate (struct gdbarch *gdbarch) /* This is the sfunc for the 'set charset' command. */ static void -set_charset_sfunc (char *charset, int from_tty, +set_charset_sfunc (const char *charset, int from_tty, struct cmd_list_element *c) { /* CAREFUL: set the target charset here as well. */ @@ -351,7 +376,7 @@ set_charset_sfunc (char *charset, int from_tty, /* 'set host-charset' command sfunc. We need a wrapper here because the function needs to have a specific signature. */ static void -set_host_charset_sfunc (char *charset, int from_tty, +set_host_charset_sfunc (const char *charset, int from_tty, struct cmd_list_element *c) { validate (get_current_arch ()); @@ -359,7 +384,7 @@ set_host_charset_sfunc (char *charset, int from_tty, /* Wrapper for the 'set target-charset' command. */ static void -set_target_charset_sfunc (char *charset, int from_tty, +set_target_charset_sfunc (const char *charset, int from_tty, struct cmd_list_element *c) { validate (get_current_arch ()); @@ -367,7 +392,7 @@ set_target_charset_sfunc (char *charset, int from_tty, /* Wrapper for the 'set target-wide-charset' command. */ static void -set_target_wide_charset_sfunc (char *charset, int from_tty, +set_target_wide_charset_sfunc (const char *charset, int from_tty, struct cmd_list_element *c) { validate (get_current_arch ()); @@ -456,14 +481,32 @@ host_hex_value (char c) /* Public character management functions. */ -/* A cleanup function which is run to close an iconv descriptor. */ - -static void -cleanup_iconv (void *p) +class iconv_wrapper { - iconv_t *descp = p; - iconv_close (*descp); -} +public: + + iconv_wrapper (const char *to, const char *from) + { + m_desc = iconv_open (to, from); + if (m_desc == (iconv_t) -1) + perror_with_name (_("Converting character sets")); + } + + ~iconv_wrapper () + { + iconv_close (m_desc); + } + + size_t convert (ICONV_CONST char **inp, size_t *inleft, char **outp, + size_t *outleft) + { + return iconv (m_desc, inp, inleft, outp, outleft); + } + +private: + + iconv_t m_desc; +}; void convert_between_encodings (const char *from, const char *to, @@ -471,8 +514,6 @@ convert_between_encodings (const char *from, const char *to, int width, struct obstack *output, enum transliterations translit) { - iconv_t desc; - struct cleanup *cleanups; size_t inleft; ICONV_CONST char *inp; unsigned int space_request; @@ -484,10 +525,7 @@ convert_between_encodings (const char *from, const char *to, return; } - desc = iconv_open (to, from); - if (desc == (iconv_t) -1) - perror_with_name (_("Converting character sets")); - cleanups = make_cleanup (cleanup_iconv, &desc); + iconv_wrapper desc (to, from); inleft = num_bytes; inp = (ICONV_CONST char *) bytes; @@ -503,14 +541,14 @@ convert_between_encodings (const char *from, const char *to, old_size = obstack_object_size (output); obstack_blank (output, space_request); - outp = obstack_base (output) + old_size; + outp = (char *) obstack_base (output) + old_size; outleft = space_request; - r = iconv (desc, &inp, &inleft, &outp, &outleft); + r = desc.convert (&inp, &inleft, &outp, &outleft); /* Now make sure that the object on the obstack only includes bytes we have converted. */ - obstack_blank (output, - (int) outleft); + obstack_blank_fast (output, -outleft); if (r == (size_t) -1) { @@ -558,77 +596,34 @@ convert_between_encodings (const char *from, const char *to, } } } - - do_cleanups (cleanups); } -/* An iterator that returns host wchar_t's from a target string. */ -struct wchar_iterator -{ - /* The underlying iconv descriptor. */ - iconv_t desc; - - /* The input string. This is updated as convert characters. */ - const gdb_byte *input; - /* The number of bytes remaining in the input. */ - size_t bytes; - - /* The width of an input character. */ - size_t width; - - /* The output buffer and its size. */ - gdb_wchar_t *out; - size_t out_size; -}; - /* Create a new iterator. */ -struct wchar_iterator * -make_wchar_iterator (const gdb_byte *input, size_t bytes, - const char *charset, size_t width) +wchar_iterator::wchar_iterator (const gdb_byte *input, size_t bytes, + const char *charset, size_t width) +: m_input (input), + m_bytes (bytes), + m_width (width), + m_out (1) { - struct wchar_iterator *result; - iconv_t desc; - - desc = iconv_open (INTERMEDIATE_ENCODING, charset); - if (desc == (iconv_t) -1) + m_desc = iconv_open (INTERMEDIATE_ENCODING, charset); + if (m_desc == (iconv_t) -1) perror_with_name (_("Converting character sets")); - - result = XNEW (struct wchar_iterator); - result->desc = desc; - result->input = input; - result->bytes = bytes; - result->width = width; - - result->out = XNEW (gdb_wchar_t); - result->out_size = 1; - - return result; -} - -static void -do_cleanup_iterator (void *p) -{ - struct wchar_iterator *iter = p; - - iconv_close (iter->desc); - xfree (iter->out); - xfree (iter); } -struct cleanup * -make_cleanup_wchar_iterator (struct wchar_iterator *iter) +wchar_iterator::~wchar_iterator () { - return make_cleanup (do_cleanup_iterator, iter); + if (m_desc != (iconv_t) -1) + iconv_close (m_desc); } int -wchar_iterate (struct wchar_iterator *iter, - enum wchar_iterate_result *out_result, - gdb_wchar_t **out_chars, - const gdb_byte **ptr, - size_t *len) +wchar_iterator::iterate (enum wchar_iterate_result *out_result, + gdb_wchar_t **out_chars, + const gdb_byte **ptr, + size_t *len) { size_t out_request; @@ -638,17 +633,17 @@ wchar_iterate (struct wchar_iterator *iter, invalid input sequence -- but we want to reliably report this to our caller so it can emit an escape sequence. */ out_request = 1; - while (iter->bytes > 0) + while (m_bytes > 0) { - ICONV_CONST char *inptr = (ICONV_CONST char *) iter->input; - char *outptr = (char *) &iter->out[0]; - const gdb_byte *orig_inptr = iter->input; - size_t orig_in = iter->bytes; + ICONV_CONST char *inptr = (ICONV_CONST char *) m_input; + char *outptr = (char *) m_out.data (); + const gdb_byte *orig_inptr = m_input; + size_t orig_in = m_bytes; size_t out_avail = out_request * sizeof (gdb_wchar_t); size_t num; - size_t r = iconv (iter->desc, &inptr, &iter->bytes, &outptr, &out_avail); + size_t r = iconv (m_desc, &inptr, &m_bytes, &outptr, &out_avail); - iter->input = (gdb_byte *) inptr; + m_input = (gdb_byte *) inptr; if (r == (size_t) -1) { @@ -663,10 +658,10 @@ wchar_iterate (struct wchar_iterator *iter, /* Otherwise skip the first invalid character, and let the caller know about it. */ *out_result = wchar_iterate_invalid; - *ptr = iter->input; - *len = iter->width; - iter->input += iter->width; - iter->bytes -= iter->width; + *ptr = m_input; + *len = m_width; + m_input += m_width; + m_bytes -= m_width; return 0; case E2BIG: @@ -677,21 +672,17 @@ wchar_iterate (struct wchar_iterator *iter, break; ++out_request; - if (out_request > iter->out_size) - { - iter->out_size = out_request; - iter->out = xrealloc (iter->out, - out_request * sizeof (gdb_wchar_t)); - } + if (out_request > m_out.size ()) + m_out.resize (out_request); continue; case EINVAL: /* Incomplete input sequence. Let the caller know, and arrange for future calls to see EOF. */ *out_result = wchar_iterate_incomplete; - *ptr = iter->input; - *len = iter->bytes; - iter->bytes = 0; + *ptr = m_input; + *len = m_bytes; + m_bytes = 0; return 0; default: @@ -703,9 +694,9 @@ wchar_iterate (struct wchar_iterator *iter, /* We converted something. */ num = out_request - out_avail / sizeof (gdb_wchar_t); *out_result = wchar_iterate_ok; - *out_chars = iter->out; + *out_chars = m_out.data (); *ptr = orig_inptr; - *len = orig_in - iter->bytes; + *len = orig_in - m_bytes; return num; } @@ -714,20 +705,33 @@ wchar_iterate (struct wchar_iterator *iter, return -1; } - -/* The charset.c module initialization function. */ +struct charset_vector +{ + ~charset_vector () + { + clear (); + } + + void clear () + { + for (char *c : charsets) + xfree (c); -extern initialize_file_ftype _initialize_charset; /* -Wmissing-prototype */ + charsets.clear (); + } -static VEC (char_ptr) *charsets; + std::vector charsets; +}; + +static charset_vector charsets; #ifdef PHONY_ICONV static void find_charset_names (void) { - VEC_safe_push (char_ptr, charsets, GDB_DEFAULT_HOST_CHARSET); - VEC_safe_push (char_ptr, charsets, NULL); + charsets.charsets.push_back (xstrdup (GDB_DEFAULT_HOST_CHARSET)); + charsets.charsets.push_back (NULL); } #else /* PHONY_ICONV */ @@ -748,7 +752,7 @@ add_one (unsigned int count, const char *const *names, void *data) unsigned int i; for (i = 0; i < count; ++i) - VEC_safe_push (char_ptr, charsets, xstrdup (names[i])); + charsets.charsets.push_back (xstrdup (names[i])); return 0; } @@ -757,7 +761,8 @@ static void find_charset_names (void) { iconvlist (add_one, NULL); - VEC_safe_push (char_ptr, charsets, NULL); + + charsets.charsets.push_back (NULL); } #else @@ -795,20 +800,18 @@ static void find_charset_names (void) { struct pex_obj *child; - char *args[3]; + const char *args[3]; int err, status; int fail = 1; int flags; - struct gdb_environ *iconv_env; + gdb_environ iconv_env = gdb_environ::from_host_environ (); char *iconv_program; /* Older iconvs, e.g. 2.2.2, don't omit the intro text if stdout is not a tty. We need to recognize it and ignore it. This text is subject to translation, so force LANGUAGE=C. */ - iconv_env = make_environ (); - init_environ (iconv_env); - set_in_environ (iconv_env, "LANGUAGE", "C"); - set_in_environ (iconv_env, "LC_ALL", "C"); + iconv_env.set ("LANGUAGE", "C"); + iconv_env.set ("LC_ALL", "C"); child = pex_init (PEX_USE_PIPES, "iconv", NULL); @@ -831,7 +834,8 @@ find_charset_names (void) #endif /* Note that we simply ignore errors here. */ if (!pex_run_in_environment (child, flags, - args[0], args, environ_vector (iconv_env), + args[0], const_cast (args), + iconv_env.envp (), NULL, NULL, &err)) { FILE *in = pex_read_output (child, 0); @@ -888,7 +892,7 @@ find_charset_names (void) break; keep_going = *p; *p = '\0'; - VEC_safe_push (char_ptr, charsets, xstrdup (start)); + charsets.charsets.push_back (xstrdup (start)); if (!keep_going) break; /* Skip any extra spaces. */ @@ -905,16 +909,14 @@ find_charset_names (void) xfree (iconv_program); pex_free (child); - free_environ (iconv_env); if (fail) { /* Some error occurred, so drop the vector. */ - free_char_ptr_vec (charsets); - charsets = NULL; + charsets.clear (); } else - VEC_safe_push (char_ptr, charsets, NULL); + charsets.charsets.push_back (NULL); } #endif /* HAVE_ICONVLIST || HAVE_LIBICONVLIST */ @@ -954,7 +956,7 @@ extern char your_gdb_wchar_t_is_bogus[(sizeof (gdb_wchar_t) == 2 || sizeof (gdb_wchar_t) == 4) ? 1 : -1]; -/* intermediate_encoding returns the charset unsed internally by +/* intermediate_encoding returns the charset used internally by GDB to convert between target and host encodings. As the test above compiled, sizeof (gdb_wchar_t) is either 2 or 4 bytes. UTF-16/32 is tested first, UCS-2/4 is tested as a second option, @@ -1004,11 +1006,11 @@ void _initialize_charset (void) { /* The first element is always "auto". */ - VEC_safe_push (char_ptr, charsets, xstrdup ("auto")); + charsets.charsets.push_back (xstrdup ("auto")); find_charset_names (); - if (VEC_length (char_ptr, charsets) > 1) - charset_enum = (const char **) VEC_address (char_ptr, charsets); + if (charsets.charsets.size () > 1) + charset_enum = (const char **) charsets.charsets.data (); else charset_enum = default_charset_names;