diff options
| author | Thomas Adam <thomas@xteddy.org> | 2015-11-12 12:01:17 +0000 |
|---|---|---|
| committer | Thomas Adam <thomas@xteddy.org> | 2015-11-12 12:01:17 +0000 |
| commit | 5f483499f3a7b98da9ac67cd62ed91034a5949ed (patch) | |
| tree | de84187f104010233d96acc68bb9cc91d173c243 /cmd-load-buffer.c | |
| parent | 333da3b64b4ce8c0343f082c3923473205ab2b27 (diff) | |
| parent | 0cc812ae342d1a71c0337db8ffb4d7701668cb38 (diff) | |
| download | rtmux-5f483499f3a7b98da9ac67cd62ed91034a5949ed.tar.gz rtmux-5f483499f3a7b98da9ac67cd62ed91034a5949ed.tar.bz2 rtmux-5f483499f3a7b98da9ac67cd62ed91034a5949ed.zip | |
Merge branch 'obsd-master'
Diffstat (limited to 'cmd-load-buffer.c')
| -rw-r--r-- | cmd-load-buffer.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/cmd-load-buffer.c b/cmd-load-buffer.c index 9352cbe5..40bea9b7 100644 --- a/cmd-load-buffer.c +++ b/cmd-load-buffer.c @@ -133,7 +133,7 @@ void cmd_load_buffer_callback(struct client *c, int closed, void *data) { const char *bufname = data; - char *pdata, *cause; + char *pdata, *cause, *saved; size_t psize; if (!closed) @@ -154,6 +154,11 @@ cmd_load_buffer_callback(struct client *c, int closed, void *data) if (paste_set(pdata, psize, bufname, &cause) != 0) { /* No context so can't use server_client_msg_error. */ + if (~c->flags & CLIENT_UTF8) { + saved = cause; + cause = utf8_sanitize(saved); + free(saved); + } evbuffer_add_printf(c->stderr_data, "%s", cause); server_push_stderr(c); free(pdata); |