koma/i3
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Send proper error messages upon parser failures, use yajl for generating command replies

Browse Source 
Fixes: #693
This commit is contained in:
Michael Stapelberg
2012-05-02 22:01:50 +02:00
parent 87cb664236
commit bbe607899c
8 changed files with 192 additions and 108 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/ipc.c
View File

@ -125,12 +125,18 @@ IPC_HANDLER(command) {
if (command_output->needs_tree_render)
tree_render();
/* If no reply was provided, we just use the default success message */
ipc_send_message(fd, strlen(command_output->json_output),
I3_IPC_REPLY_TYPE_COMMAND,
(const uint8_t*)command_output->json_output);
const unsigned char *reply;
#if YAJL_MAJOR >= 2
size_t length;
#else
unsigned int length;
#endif
yajl_gen_get_buf(command_output->json_gen, &reply, &length);
free(command_output->json_output);
ipc_send_message(fd, length, I3_IPC_REPLY_TYPE_COMMAND,
(const uint8_t*)reply);
yajl_gen_free(command_output->json_gen);
}
static void dump_rect(yajl_gen gen, const char *name, Rect r) {