|
|
@ -346,9 +346,10 @@ struct cmd_handler *find_handler(struct cmd_handler handlers[], int l, char *lin
|
|
|
|
int handle_command(struct sway_config *config, char *exec) {
|
|
|
|
int handle_command(struct sway_config *config, char *exec) {
|
|
|
|
sway_log(L_INFO, "Handling command '%s'", exec);
|
|
|
|
sway_log(L_INFO, "Handling command '%s'", exec);
|
|
|
|
char *ptr, *cmd;
|
|
|
|
char *ptr, *cmd;
|
|
|
|
|
|
|
|
int ret;
|
|
|
|
|
|
|
|
|
|
|
|
if ((ptr = strchr(exec, ' ')) == NULL) {
|
|
|
|
if ((ptr = strchr(exec, ' ')) == NULL) {
|
|
|
|
cmd = malloc(strlen(exec) + 1);
|
|
|
|
cmd = exec;
|
|
|
|
strcpy(cmd, exec);
|
|
|
|
|
|
|
|
} else {
|
|
|
|
} else {
|
|
|
|
int index = ptr - exec;
|
|
|
|
int index = ptr - exec;
|
|
|
|
cmd = malloc(index + 1);
|
|
|
|
cmd = malloc(index + 1);
|
|
|
@ -358,18 +359,22 @@ int handle_command(struct sway_config *config, char *exec) {
|
|
|
|
struct cmd_handler *handler = find_handler(handlers, sizeof(handlers) / sizeof(struct cmd_handler), cmd);
|
|
|
|
struct cmd_handler *handler = find_handler(handlers, sizeof(handlers) / sizeof(struct cmd_handler), cmd);
|
|
|
|
if (handler == NULL) {
|
|
|
|
if (handler == NULL) {
|
|
|
|
sway_log(L_ERROR, "Unknown command '%s'", cmd);
|
|
|
|
sway_log(L_ERROR, "Unknown command '%s'", cmd);
|
|
|
|
return 0; // TODO: return error, probably
|
|
|
|
ret = 0; // TODO: return error, probably
|
|
|
|
}
|
|
|
|
} else {
|
|
|
|
int argc;
|
|
|
|
int argc;
|
|
|
|
char **argv = split_directive(exec + strlen(handler->command), &argc);
|
|
|
|
char **argv = split_directive(exec + strlen(handler->command), &argc);
|
|
|
|
int ret = handler->handle(config, argc, argv);
|
|
|
|
int i;
|
|
|
|
int i;
|
|
|
|
ret = handler->handle(config, argc, argv);
|
|
|
|
for (i = 0; i < argc; ++i) {
|
|
|
|
for (i = 0; i < argc; ++i) {
|
|
|
|
free(argv[i]);
|
|
|
|
free(argv[i]);
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
free(argv);
|
|
|
|
|
|
|
|
if (ret != 0) {
|
|
|
|
|
|
|
|
sway_log(L_ERROR, "Command failed: %s", cmd);
|
|
|
|
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
free(argv);
|
|
|
|
if(ptr) {
|
|
|
|
if (ret != 0) {
|
|
|
|
free(cmd);
|
|
|
|
sway_log(L_ERROR, "Command failed: %s", cmd);
|
|
|
|
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return ret;
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
}
|
|
|
|