mirrors/sway
1
0
Fork 0
mirror of https://github.com/swaywm/sway.git synced 2026-02-27 01:40:43 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

input_cmd_xkb_file: allow shell path expansion

Browse source 
This allows for shell path expansion for input_cmd_xkb_file. The logic
has been extracted from output_cmd_background
This commit is contained in:
Brian Ashworth 2019-11-20 22:10:03 -05:00 • committed by Drew DeVault
parent 66725f2e27
commit 2f858a1ada
4 changed files with 47 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

22
sway/commands/input/xkb_file.c
View file

@ -1,7 +1,10 @@
#define _POSIX_C_SOURCE 200809L
#include <unistd.h>
#include <errno.h>
#include "sway/config.h"
#include "sway/commands.h"
#include "log.h"
#include "stringop.h"
struct cmd_results *input_cmd_xkb_file(int argc, char **argv) {
struct cmd_results *error = NULL;
@ -18,6 +21,25 @@ struct cmd_results *input_cmd_xkb_file(int argc, char **argv) {
ic->xkb_file = NULL;
} else {
ic->xkb_file = strdup(argv[0]);
if (!expand_path(&ic->xkb_file)) {
error = cmd_results_new(CMD_INVALID, "Invalid syntax (%s)",
ic->xkb_file);
free(ic->xkb_file);
ic->xkb_file = NULL;
return error;
}
if (!ic->xkb_file) {
sway_log(SWAY_ERROR, "Failed to allocate expanded path");
return cmd_results_new(CMD_FAILURE, "Unable to allocate resource");
}
bool can_access = access(ic->xkb_file, F_OK) != -1;
if (!can_access) {
sway_log_errno(SWAY_ERROR, "Unable to access xkb file '%s'",
ic->xkb_file);
config_add_swaynag_warning("Unable to access xkb file '%s'",
ic->xkb_file);
}
}
ic->xkb_file_is_set = true;