mirrors/sway
1
0
Fork 0
mirror of https://github.com/swaywm/sway.git synced 2024-12-30 17:06:40 +01:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #3587 from RedSoxFan/fix-background-missing-file

Browse source 
output_cmd_background: fix no file + valid mode
This commit is contained in:
Drew DeVault 2019-02-05 22:09:59 +01:00 committed by GitHub
commit a3c5314856
Failed to generate hash of commit
2 changed files with 6 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
common/stringop.c
View file

@ -258,6 +258,9 @@ int unescape_string(char *string) {
} }
char *join_args(char **argv, int argc) { char *join_args(char **argv, int argc) {
if (!sway_assert(argc > 0, "argc should be positive")) {
return NULL;
}
int len = 0, i; int len = 0, i;
for (i = 0; i < argc; ++i) { for (i = 0; i < argc; ++i) {
len += strlen(argv[i]) + 1; len += strlen(argv[i]) + 1;

3
sway/commands/output/background.c
View file

@ -61,6 +61,9 @@ struct cmd_results *output_cmd_background(int argc, char **argv) {
return cmd_results_new(CMD_INVALID, return cmd_results_new(CMD_INVALID,
"Missing background scaling mode."); "Missing background scaling mode.");
} }
if (j == 0) {
return cmd_results_new(CMD_INVALID, "Missing background file");
}
wordexp_t p = {0}; wordexp_t p = {0};
char *src = join_args(argv, j); char *src = join_args(argv, j);