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

ipc_recv_message: store message_type, don’t compare. add distinct EOF retval

Browse Source 
Also use ELOG, which requires i3-msg to provide logging functions.
This commit is contained in:
Michael Stapelberg
2013-01-23 18:50:21 +01:00
parent e8fa3eeebd
commit dcb8ac84f8
5 changed files with 53 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
i3-msg/main.c
View File

@ -36,6 +36,26 @@
static char *socket_path;
/*
* Having verboselog() and errorlog() is necessary when using libi3.
*
*/
void verboselog(char *fmt, ...) {
va_list args;
va_start(args, fmt);
vfprintf(stdout, fmt, args);
va_end(args);
}
void errorlog(char *fmt, ...) {
va_list args;
va_start(args, fmt);
vfprintf(stderr, fmt, args);
va_end(args);
}
int main(int argc, char *argv[]) {
socket_path = getenv("I3SOCK");
int o, option_index = 0;
@ -135,13 +155,16 @@ int main(int argc, char *argv[]) {
return 0;
uint32_t reply_length;
uint32_t reply_type;
uint8_t *reply;
int ret;
if ((ret = ipc_recv_message(sockfd, message_type, &reply_length, &reply)) != 0) {
if ((ret = ipc_recv_message(sockfd, &reply_type, &reply_length, &reply)) != 0) {
if (ret == -1)
err(EXIT_FAILURE, "IPC: read()");
exit(1);
}
if (reply_type != message_type)
errx(EXIT_FAILURE, "IPC: Received reply of type %d but expected %d", reply_type, message_type);
printf("%.*s\n", reply_length, reply);
free(reply);