circlecloud/tmux
1
0
Fork 0
mirror of https://github.com/tmux/tmux.git synced 2024-12-13 01:48:47 +00:00
Code Issues Projects Releases Wiki Activity

Plain stravis() because it will mangle UTF-8 characters, so add

Browse Source 
utf8_stravis() which calls our existing utf8_strvis() and use it instead
This commit is contained in:
nicm 2017-01-18 10:08:05 +00:00
parent 4bb5a1d6a7
commit faa0570309
4 changed files with 18 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
arguments.c
View File

@ -162,7 +162,7 @@ args_print(struct args *args)
flags = VIS_OCTAL|VIS_TAB|VIS_NL; flags = VIS_OCTAL|VIS_TAB|VIS_NL;
if (entry->value[strcspn(entry->value, quoted)] != '\0') if (entry->value[strcspn(entry->value, quoted)] != '\0')
flags |= VIS_DQ; flags |= VIS_DQ;
stravis(&escaped, entry->value, flags); utf8_stravis(&escaped, entry->value, flags);
if (flags & VIS_DQ) if (flags & VIS_DQ)
args_print_add(&buf, &len, "\"%s\"", escaped); args_print_add(&buf, &len, "\"%s\"", escaped);
else else
@ -178,7 +178,7 @@ args_print(struct args *args)
flags = VIS_OCTAL|VIS_TAB|VIS_NL; flags = VIS_OCTAL|VIS_TAB|VIS_NL;
if (args->argv[i][strcspn(args->argv[i], quoted)] != '\0') if (args->argv[i][strcspn(args->argv[i], quoted)] != '\0')
flags |= VIS_DQ; flags |= VIS_DQ;
stravis(&escaped, args->argv[i], flags); utf8_stravis(&escaped, args->argv[i], flags);
if (flags & VIS_DQ) if (flags & VIS_DQ)
args_print_add(&buf, &len, "\"%s\"", escaped); args_print_add(&buf, &len, "\"%s\"", escaped);
else else

2
cmd-show-options.c
View File

@ -105,7 +105,7 @@ cmd_show_options_print(struct cmd *self, struct cmdq_item *item,
if (args_has(self->args, 'v')) if (args_has(self->args, 'v'))
cmdq_print(item, "%s", value); cmdq_print(item, "%s", value);
else if (options_isstring(o)) { else if (options_isstring(o)) {
stravis(&escaped, value, VIS_OCTAL|VIS_TAB|VIS_NL|VIS_DQ); utf8_stravis(&escaped, value, VIS_OCTAL|VIS_TAB|VIS_NL|VIS_DQ);
cmdq_print(item, "%s \"%s\"", name, escaped); cmdq_print(item, "%s \"%s\"", name, escaped);
free(escaped); free(escaped);
} else } else

1
tmux.h
View File

@ -2295,6 +2295,7 @@ enum utf8_state utf8_append(struct utf8_data *, u_char);
enum utf8_state utf8_combine(const struct utf8_data *, wchar_t *); enum utf8_state utf8_combine(const struct utf8_data *, wchar_t *);
enum utf8_state utf8_split(wchar_t, struct utf8_data *); enum utf8_state utf8_split(wchar_t, struct utf8_data *);
int utf8_strvis(char *, const char *, size_t, int); int utf8_strvis(char *, const char *, size_t, int);
int utf8_stravis(char **, const char *, int);
char *utf8_sanitize(const char *); char *utf8_sanitize(const char *);
size_t utf8_strlen(const struct utf8_data *); size_t utf8_strlen(const struct utf8_data *);
u_int utf8_strwidth(const struct utf8_data *, ssize_t); u_int utf8_strwidth(const struct utf8_data *, ssize_t);

14
utf8.c
View File

@ -193,6 +193,20 @@ utf8_strvis(char *dst, const char *src, size_t len, int flag)
return (dst - start); return (dst - start);
} }
/* Same as utf8_strvis but allocate the buffer. */
int
utf8_stravis(char **dst, const char *src, int flag)
{
char *buf;
int len;
buf = xreallocarray(NULL, 4, strlen(src) + 1);
len = utf8_strvis(buf, src, strlen(src), flag);
*dst = xrealloc(buf, len + 1);
return (len);
}
/* /*
* Sanitize a string, changing any UTF-8 characters to '_'. Caller should free * Sanitize a string, changing any UTF-8 characters to '_'. Caller should free
* the returned string. Anything not valid printable ASCII or UTF-8 is * the returned string. Anything not valid printable ASCII or UTF-8 is