Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Variables related fixes #693

Merged
merged 10 commits into from
Jun 6, 2016
Merged

Variables related fixes #693

Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
1ab3e10
Including error message when variable do not start with $
thuck Jun 2, 2016
e4f8087
Fix output command when varible not set
thuck Jun 2, 2016
8a08e83
Merge branch 'master' into variables_corner_cases
thuck Jun 2, 2016
431013d
Merge branch 'master' of https://github.com/SirCmpwn/sway into variab…
thuck Jun 2, 2016
8274efc
Merge branch 'variables_corner_cases' of https://github.com/thuck/swa…
thuck Jun 2, 2016
f55b5a4
Fix identation issue
thuck Jun 2, 2016
bf2298e
Includes $ for variables without it
thuck Jun 3, 2016
29eb3bf
Put w to uppercase just to keep consistency between warnings
thuck Jun 3, 2016
3c3e98b
Merge branch 'master' into variables_corner_cases
thuck Jun 5, 2016
cdd8664
Merge branch 'master' into variables_corner_cases
thuck Jun 6, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 16 additions & 2 deletions sway/commands.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1632,7 +1632,7 @@ static struct cmd_results *cmd_output(int argc, char **argv) {
}
char *src = join_args(argv + i, argc - i - 1);
char *mode = argv[argc - 1];
if (wordexp(src, &p, 0) != 0) {
if (wordexp(src, &p, 0) != 0 || p.we_wordv[0] == NULL) {
return cmd_results_new(CMD_INVALID, "output", "Invalid syntax (%s)", src);
}
free(src);
Expand Down Expand Up @@ -2146,12 +2146,26 @@ static int compare_set_qsort(const void *_l, const void *_r) {
}

static struct cmd_results *cmd_set(int argc, char **argv) {
char *tmp;
int size;
struct cmd_results *error = NULL;
if (!config->reading) return cmd_results_new(CMD_FAILURE, "set", "Can only be used in config file.");
if ((error = checkarg(argc, "set", EXPECTED_AT_LEAST, 2))) {
return error;
}

if (argv[0][0] != '$') {
sway_log(L_INFO, "Warning: variable '%s' doesn't start with $", argv[0]);

size = asprintf(&tmp, "%s%s", "$", argv[0]);
if (size == -1) {
return cmd_results_new(CMD_FAILURE, "set", "Not possible to create variable $'%s'", argv[0]);
}

argv[0] = strdup(tmp);
free(tmp);
}

struct sway_variable *var = NULL;
// Find old variable if it exists
int i;
Expand Down Expand Up @@ -3033,7 +3047,7 @@ static struct cmd_results *bar_cmd_swaybar_command(int argc, char **argv) {
}

static struct cmd_results *bar_cmd_tray_output(int argc, char **argv) {
sway_log(L_ERROR, "warning: tray_output is not supported on wayland");
sway_log(L_ERROR, "Warning: tray_output is not supported on wayland");
return cmd_results_new(CMD_SUCCESS, NULL, NULL);
}

Expand Down