X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=i3-msg%2Fmain.c;h=5161245970d848ddbdd0579b2ab59228500e811a;hb=f58dde28504cd78267439ec232be9689ff82d47c;hp=a1428fb8f5f89aac9e35f68420f983b808ee7303;hpb=fcdfab4d280cf469f339ce7168082658b9b76c8c;p=i3%2Fi3 diff --git a/i3-msg/main.c b/i3-msg/main.c index a1428fb8..51612459 100644 --- a/i3-msg/main.c +++ b/i3-msg/main.c @@ -2,7 +2,7 @@ * vim:ts=4:sw=4:expandtab * * i3 - an improved dynamic tiling window manager - * © 2009-2012 Michael Stapelberg and contributors (see also: LICENSE) + * © 2009 Michael Stapelberg and contributors (see also: LICENSE) * * i3-msg/main.c: Utility which sends messages to a running i3-instance using * IPC via UNIX domain sockets. @@ -14,6 +14,8 @@ * Additionally, it’s even useful sometimes :-). * */ +#include "libi3.h" + #include #include #include @@ -34,7 +36,6 @@ #include #include -#include "libi3.h" #include static char *socket_path; @@ -76,20 +77,17 @@ static int reply_boolean_cb(void *params, int val) { return 1; } -#if YAJL_MAJOR >= 2 static int reply_string_cb(void *params, const unsigned char *val, size_t len) { -#else -static int reply_string_cb(void *params, const unsigned char *val, unsigned int len) { -#endif - char *str = scalloc(len + 1); - strncpy(str, (const char*)val, len); + char *str = scalloc(len + 1, 1); + strncpy(str, (const char *)val, len); if (strcmp(last_key, "error") == 0) last_reply.error = str; else if (strcmp(last_key, "input") == 0) last_reply.input = str; else if (strcmp(last_key, "errorposition") == 0) last_reply.errorposition = str; - else free(str); + else + free(str); return 1; } @@ -106,36 +104,33 @@ static int reply_end_map_cb(void *params) { return 1; } - -#if YAJL_MAJOR >= 2 static int reply_map_key_cb(void *params, const unsigned char *keyVal, size_t keyLen) { -#else -static int reply_map_key_cb(void *params, const unsigned char *keyVal, unsigned keyLen) { -#endif free(last_key); - last_key = scalloc(keyLen + 1); - strncpy(last_key, (const char*)keyVal, keyLen); + last_key = scalloc(keyLen + 1, 1); + strncpy(last_key, (const char *)keyVal, keyLen); return 1; } -yajl_callbacks reply_callbacks = { - NULL, - &reply_boolean_cb, - NULL, - NULL, - NULL, - &reply_string_cb, - &reply_start_map_cb, - &reply_map_key_cb, - &reply_end_map_cb, - NULL, - NULL +static yajl_callbacks reply_callbacks = { + .yajl_boolean = reply_boolean_cb, + .yajl_string = reply_string_cb, + .yajl_start_map = reply_start_map_cb, + .yajl_map_key = reply_map_key_cb, + .yajl_end_map = reply_end_map_cb, }; int main(int argc, char *argv[]) { - socket_path = getenv("I3SOCK"); +#if defined(__OpenBSD__) + if (pledge("stdio rpath unix", NULL) == -1) + err(EXIT_FAILURE, "pledge"); +#endif + char *env_socket_path = getenv("I3SOCK"); + if (env_socket_path) + socket_path = sstrdup(env_socket_path); + else + socket_path = NULL; int o, option_index = 0; - int message_type = I3_IPC_MESSAGE_TYPE_COMMAND; + uint32_t message_type = I3_IPC_MESSAGE_TYPE_COMMAND; char *payload = NULL; bool quiet = false; @@ -145,8 +140,7 @@ int main(int argc, char *argv[]) { {"version", no_argument, 0, 'v'}, {"quiet", no_argument, 0, 'q'}, {"help", no_argument, 0, 'h'}, - {0, 0, 0, 0} - }; + {0, 0, 0, 0}}; char *options_string = "s:t:vhq"; @@ -168,11 +162,13 @@ int main(int argc, char *argv[]) { message_type = I3_IPC_MESSAGE_TYPE_GET_MARKS; else if (strcasecmp(optarg, "get_bar_config") == 0) message_type = I3_IPC_MESSAGE_TYPE_GET_BAR_CONFIG; + else if (strcasecmp(optarg, "get_binding_modes") == 0) + message_type = I3_IPC_MESSAGE_TYPE_GET_BINDING_MODES; else if (strcasecmp(optarg, "get_version") == 0) message_type = I3_IPC_MESSAGE_TYPE_GET_VERSION; else { printf("Unknown message type\n"); - printf("Known types: command, get_workspaces, get_outputs, get_tree, get_marks, get_bar_config, get_version\n"); + printf("Known types: command, get_workspaces, get_outputs, get_tree, get_marks, get_bar_config, get_binding_modes, get_version\n"); exit(EXIT_FAILURE); } } else if (o == 'q') { @@ -188,7 +184,7 @@ int main(int argc, char *argv[]) { } if (socket_path == NULL) - socket_path = root_atom_contents("I3_SOCKET_PATH"); + socket_path = root_atom_contents("I3_SOCKET_PATH", NULL, 0); /* Fall back to the default socket path */ if (socket_path == NULL) @@ -202,8 +198,7 @@ int main(int argc, char *argv[]) { payload = sstrdup(argv[optind]); } else { char *both; - if (asprintf(&both, "%s %s", payload, argv[optind]) == -1) - err(EXIT_FAILURE, "asprintf"); + sasprintf(&both, "%s %s", payload, argv[optind]); free(payload); payload = both; } @@ -221,10 +216,10 @@ int main(int argc, char *argv[]) { memset(&addr, 0, sizeof(struct sockaddr_un)); addr.sun_family = AF_LOCAL; strncpy(addr.sun_path, socket_path, sizeof(addr.sun_path) - 1); - if (connect(sockfd, (const struct sockaddr*)&addr, sizeof(struct sockaddr_un)) < 0) + if (connect(sockfd, (const struct sockaddr *)&addr, sizeof(struct sockaddr_un)) < 0) err(EXIT_FAILURE, "Could not connect to i3 on socket \"%s\"", socket_path); - if (ipc_send_message(sockfd, strlen(payload), message_type, (uint8_t*)payload) == -1) + if (ipc_send_message(sockfd, strlen(payload), message_type, (uint8_t *)payload) == -1) err(EXIT_FAILURE, "IPC: write()"); if (quiet) @@ -245,21 +240,12 @@ int main(int argc, char *argv[]) { * If not, nicely format the error message. */ if (reply_type == I3_IPC_MESSAGE_TYPE_COMMAND) { yajl_handle handle; -#if YAJL_MAJOR < 2 - yajl_parser_config parse_conf = { 0, 0 }; - - handle = yajl_alloc(&reply_callbacks, &parse_conf, NULL, NULL); -#else handle = yajl_alloc(&reply_callbacks, NULL, NULL); -#endif - yajl_status state = yajl_parse(handle, (const unsigned char*)reply, reply_length); + yajl_status state = yajl_parse(handle, (const unsigned char *)reply, reply_length); switch (state) { case yajl_status_ok: break; case yajl_status_client_canceled: -#if YAJL_MAJOR < 2 - case yajl_status_insufficient_data: -#endif case yajl_status_error: errx(EXIT_FAILURE, "IPC: Could not parse JSON reply."); }