2a684cad5f
Patch tested by compiling with `__attribute__ ((format (printf, 2, 3)))` applied to `cmd_results_new`. String usage constants have been converted from pointers to arrays when encountered. General handler format strings were sometimes modified to include the old input string, especially for unknown command errors.
64 lines
1.4 KiB
C
64 lines
1.4 KiB
C
#define _POSIX_C_SOURCE 200809L
|
|
#include <stdio.h>
|
|
#include <string.h>
|
|
#include "sway/commands.h"
|
|
#include "sway/criteria.h"
|
|
#include "list.h"
|
|
#include "log.h"
|
|
#include "stringop.h"
|
|
|
|
struct cmd_results *cmd_assign(int argc, char **argv) {
|
|
struct cmd_results *error = NULL;
|
|
if ((error = checkarg(argc, "assign", EXPECTED_AT_LEAST, 2))) {
|
|
return error;
|
|
}
|
|
|
|
// Create criteria
|
|
char *err_str = NULL;
|
|
struct criteria *criteria = criteria_parse(argv[0], &err_str);
|
|
if (!criteria) {
|
|
error = cmd_results_new(CMD_INVALID, err_str);
|
|
free(err_str);
|
|
return error;
|
|
}
|
|
|
|
--argc; ++argv;
|
|
|
|
if (strncmp(*argv, "→", strlen("→")) == 0) {
|
|
if (argc < 2) {
|
|
free(criteria);
|
|
return cmd_results_new(CMD_INVALID, "Missing workspace");
|
|
}
|
|
--argc;
|
|
++argv;
|
|
}
|
|
|
|
if (strcmp(*argv, "output") == 0) {
|
|
criteria->type = CT_ASSIGN_OUTPUT;
|
|
--argc; ++argv;
|
|
} else {
|
|
if (strcmp(*argv, "workspace") == 0) {
|
|
--argc; ++argv;
|
|
}
|
|
if (strcmp(*argv, "number") == 0) {
|
|
--argc; ++argv;
|
|
if (argv[0][0] < '0' || argv[0][0] > '9') {
|
|
free(criteria);
|
|
return cmd_results_new(CMD_INVALID,
|
|
"Invalid workspace number '%s'", argv[0]);
|
|
}
|
|
criteria->type = CT_ASSIGN_WORKSPACE_NUMBER;
|
|
} else {
|
|
criteria->type = CT_ASSIGN_WORKSPACE;
|
|
}
|
|
}
|
|
|
|
criteria->target = join_args(argv, argc);
|
|
|
|
list_add(config->criteria, criteria);
|
|
wlr_log(WLR_DEBUG, "assign: '%s' -> '%s' added", criteria->raw,
|
|
criteria->target);
|
|
|
|
return cmd_results_new(CMD_SUCCESS, NULL);
|
|
}
|