mirrors/sway
1
0
Fork 0
mirror of https://github.com/swaywm/sway.git synced 2024-12-28 07:56:31 +01:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #45 from taiyu-len/master

Browse source 
fixed split [vh], small memory leak, unescape_strings handle \xnn
This commit is contained in:
Drew DeVault 2015-08-16 16:44:38 -04:00
commit c5d98fe6fe
3 changed files with 58 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
sway/commands.c
View file

@ -285,9 +285,9 @@ static bool cmd_split(struct sway_config *config, int argc, char **argv) {
return false; return false;
} }
if (strcasecmp(argv[0], "v") == 0 || strcasecmp(argv[0], "vertical") == 0) { if (strcasecmp(argv[0], "v") == 0 || strcasecmp(argv[0], "vertical") == 0) {
_do_split(config, argc, argv, L_VERT); _do_split(config, argc - 1, argv + 1, L_VERT);
} else if (strcasecmp(argv[0], "h") == 0 || strcasecmp(argv[0], "horizontal") == 0) { } else if (strcasecmp(argv[0], "h") == 0 || strcasecmp(argv[0], "horizontal") == 0) {
_do_split(config, argc, argv, L_HORIZ); _do_split(config, argc - 1, argv + 1, L_HORIZ);
} else { } else {
sway_log(L_ERROR, "Invalid split command (expected either horiziontal or vertical)."); sway_log(L_ERROR, "Invalid split command (expected either horiziontal or vertical).");
return false; return false;

3
sway/container.c
View file

@ -31,6 +31,9 @@ static void free_swayc(swayc_t *c) {
} }
remove_child(c->parent, c); remove_child(c->parent, c);
} }
if (c->name) {
free(c->name);
}
free(c); free(c);
} }

73
sway/stringop.c
View file

@ -53,8 +53,9 @@ char *strip_comments(char *str) {
list_t *split_string(const char *str, const char *delims) { list_t *split_string(const char *str, const char *delims) {
list_t *res = create_list(); list_t *res = create_list();
int i, j; int i, j;
for (i = 0, j = 0; i < strlen(str) + 1; ++i) { int len = strlen(str);
if (strchr(delims, str[i]) || i == strlen(str)) { for (i = 0, j = 0; i < len + 1; ++i) {
if (strchr(delims, str[i]) || i == len) {
if (i - j == 0) { if (i - j == 0) {
continue; continue;
} }
@ -63,7 +64,7 @@ list_t *split_string(const char *str, const char *delims) {
left[i - j] = 0; left[i - j] = 0;
list_add(res, left); list_add(res, left);
j = i + 1; j = i + 1;
while (j <= strlen(str) && str[j] && strchr(delims, str[j])) { while (j <= len && str[j] && strchr(delims, str[j])) {
j++; j++;
i++; i++;
} }
@ -110,40 +111,72 @@ int unescape_string(char *string) {
for (i = 0; string[i]; ++i) { for (i = 0; string[i]; ++i) {
if (string[i] == '\\') { if (string[i] == '\\') {
--len; --len;
int shift = 0;
switch (string[++i]) { switch (string[++i]) {
case '0': case '0':
string[i - 1] = '\0'; string[i - 1] = '\0';
memmove(string + i, string + i + 1, len - i); shift = 1;
break; break;
case 'a': case 'a':
string[i - 1] = '\a'; string[i - 1] = '\a';
memmove(string + i, string + i + 1, len - i); shift = 1;
break; break;
case 'b': case 'b':
string[i - 1] = '\b'; string[i - 1] = '\b';
memmove(string + i, string + i + 1, len - i); shift = 1;
break;
case 't':
string[i - 1] = '\t';
memmove(string + i, string + i + 1, len - i);
break;
case 'n':
string[i - 1] = '\n';
memmove(string + i, string + i + 1, len - i);
break;
case 'v':
string[i - 1] = '\v';
memmove(string + i, string + i + 1, len - i);
break; break;
case 'f': case 'f':
string[i - 1] = '\f'; string[i - 1] = '\f';
memmove(string + i, string + i + 1, len - i); shift = 1;
break;
case 'n':
string[i - 1] = '\n';
shift = 1;
break; break;
case 'r': case 'r':
string[i - 1] = '\r'; string[i - 1] = '\r';
memmove(string + i, string + i + 1, len - i); shift = 1;
break; break;
case 't':
string[i - 1] = '\t';
shift = 1;
break;
case 'v':
string[i - 1] = '\v';
shift = 1;
break;
case '\\':
shift = 1;
break;
case '\'':
string[i - 1] = '\'';
shift = 1;
break;
case '\"':
string[i - 1] = '\"';
shift = 1;
break;
case '?':
string[i - 1] = '?';
shift = 1;
break;
case 'x':
{
unsigned char c = 0;
shift = 1;
if (string[i+1] >= '0' && string[i+1] <= '9') {
shift = 2;
c = string[i+1] - '0';
if (string[i+2] >= '0' && string[i+2] <= '9') {
shift = 3;
c *= 0x10;
c += string[i+2] - '0';
}
}
string[i - 1] = c;
}
} }
memmove(string + i, string + i + shift, len - i);
} }
} }
return len; return len;