}
}
-static void
-parse_output_option (struct terminal_opts *to, const char *option)
-{
- const char *equals;
- char *key, *value;
-
- equals = strchr (option, '=');
- if (equals == NULL)
- {
- error (0, 0, _("%s: output option missing `='"), option);
- return;
- }
-
- key = xmemdup0 (option, equals - option);
- if (string_map_contains (&to->options, key))
- {
- error (0, 0, _("%s: output option specified more than once"), key);
- free (key);
- return;
- }
-
- value = xmemdup0 (equals + 1, strlen (equals + 1));
- string_map_insert_nocopy (&to->options, key, value);
-}
-
static char *
get_supported_formats (void)
{
struct string_set format_set;
char *format_string;
const char *format;
- size_t i;
/* Get supported formats as unordered set. */
string_set_init (&format_set);
break;
case OPT_OUTPUT_OPTION:
- parse_output_option (to, optarg);
+ output_driver_parse_option (optarg, &to->options);
break;
case OPT_NO_OUTPUT:
return to;
}
-/* Return true iff the terminal appears to be an xterm with
- UTF-8 capabilities */
-static bool
-term_is_utf8_xterm (void)
-{
- char *s = NULL;
-
- if ( (s = getenv ("TERM")) && (0 == strcmp ("xterm", s)) )
- if ( (s = getenv ("XTERM_LOCALE")) )
- return strcasestr (s, "utf8") || strcasestr (s, "utf-8");
-
- return false;
-}
-
void
terminal_opts_done (struct terminal_opts *to, int argc, char *argv[])
{
register_output_driver (to);
if (!to->has_output_driver)
{
- if ((0 == strcmp (locale_charset (), "UTF-8"))
- ||
- (term_is_utf8_xterm ()) )
- {
- string_map_insert (&to->options, "box", "unicode");
- }
-
string_map_insert (&to->options, "output-file", "-");
string_map_insert (&to->options, "format", "txt");
register_output_driver (to);