diff options
author | Drew DeVault <sir@cmpwn.com> | 2016-06-06 07:37:31 -0400 |
---|---|---|
committer | Drew DeVault <sir@cmpwn.com> | 2016-06-06 07:37:31 -0400 |
commit | 2e10f0abbc23930d6c89e3d0f4588d1a6f80143e (patch) | |
tree | a18924024087a5834808618e6d47bae9f69e7fea | |
parent | Merge pull request #699 from roosemberth/master (diff) | |
parent | Merge branch 'master' into variables_corner_cases (diff) | |
download | sway-2e10f0abbc23930d6c89e3d0f4588d1a6f80143e.tar.gz sway-2e10f0abbc23930d6c89e3d0f4588d1a6f80143e.tar.zst sway-2e10f0abbc23930d6c89e3d0f4588d1a6f80143e.zip |
Merge pull request #693 from thuck/variables_corner_cases
Variables related fixes
-rw-r--r-- | sway/commands.c | 18 |
1 files changed, 16 insertions, 2 deletions
diff --git a/sway/commands.c b/sway/commands.c index 83a9e7e9..eab4a1c1 100644 --- a/sway/commands.c +++ b/sway/commands.c | |||
@@ -1632,7 +1632,7 @@ static struct cmd_results *cmd_output(int argc, char **argv) { | |||
1632 | } | 1632 | } |
1633 | char *src = join_args(argv + i, argc - i - 1); | 1633 | char *src = join_args(argv + i, argc - i - 1); |
1634 | char *mode = argv[argc - 1]; | 1634 | char *mode = argv[argc - 1]; |
1635 | if (wordexp(src, &p, 0) != 0) { | 1635 | if (wordexp(src, &p, 0) != 0 || p.we_wordv[0] == NULL) { |
1636 | return cmd_results_new(CMD_INVALID, "output", "Invalid syntax (%s)", src); | 1636 | return cmd_results_new(CMD_INVALID, "output", "Invalid syntax (%s)", src); |
1637 | } | 1637 | } |
1638 | free(src); | 1638 | free(src); |
@@ -2146,12 +2146,26 @@ static int compare_set_qsort(const void *_l, const void *_r) { | |||
2146 | } | 2146 | } |
2147 | 2147 | ||
2148 | static struct cmd_results *cmd_set(int argc, char **argv) { | 2148 | static struct cmd_results *cmd_set(int argc, char **argv) { |
2149 | char *tmp; | ||
2150 | int size; | ||
2149 | struct cmd_results *error = NULL; | 2151 | struct cmd_results *error = NULL; |
2150 | if (!config->reading) return cmd_results_new(CMD_FAILURE, "set", "Can only be used in config file."); | 2152 | if (!config->reading) return cmd_results_new(CMD_FAILURE, "set", "Can only be used in config file."); |
2151 | if ((error = checkarg(argc, "set", EXPECTED_AT_LEAST, 2))) { | 2153 | if ((error = checkarg(argc, "set", EXPECTED_AT_LEAST, 2))) { |
2152 | return error; | 2154 | return error; |
2153 | } | 2155 | } |
2154 | 2156 | ||
2157 | if (argv[0][0] != '$') { | ||
2158 | sway_log(L_INFO, "Warning: variable '%s' doesn't start with $", argv[0]); | ||
2159 | |||
2160 | size = asprintf(&tmp, "%s%s", "$", argv[0]); | ||
2161 | if (size == -1) { | ||
2162 | return cmd_results_new(CMD_FAILURE, "set", "Not possible to create variable $'%s'", argv[0]); | ||
2163 | } | ||
2164 | |||
2165 | argv[0] = strdup(tmp); | ||
2166 | free(tmp); | ||
2167 | } | ||
2168 | |||
2155 | struct sway_variable *var = NULL; | 2169 | struct sway_variable *var = NULL; |
2156 | // Find old variable if it exists | 2170 | // Find old variable if it exists |
2157 | int i; | 2171 | int i; |
@@ -3033,7 +3047,7 @@ static struct cmd_results *bar_cmd_swaybar_command(int argc, char **argv) { | |||
3033 | } | 3047 | } |
3034 | 3048 | ||
3035 | static struct cmd_results *bar_cmd_tray_output(int argc, char **argv) { | 3049 | static struct cmd_results *bar_cmd_tray_output(int argc, char **argv) { |
3036 | sway_log(L_ERROR, "warning: tray_output is not supported on wayland"); | 3050 | sway_log(L_ERROR, "Warning: tray_output is not supported on wayland"); |
3037 | return cmd_results_new(CMD_SUCCESS, NULL, NULL); | 3051 | return cmd_results_new(CMD_SUCCESS, NULL, NULL); |
3038 | } | 3052 | } |
3039 | 3053 | ||