gryf/wmaker
1
0
Fork 0
mirror of https://github.com/gryf/wmaker.git synced 2025-12-19 12:28:22 +01:00
Code Issues Projects Releases Wiki Activity

Fixed bug with incorrect un-escaping if there is a dot in wm_class.

Browse Source
This commit is contained in:
dan
2003-09-03 19:09:20 +00:00
parent 6aed0cd713
commit 847479b886
3 changed files with 27 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

60
src/misc.c
View File

@@ -1124,7 +1124,6 @@ void
UnescapeWM_CLASS(char *str, char **name, char **class)
{
int i, j, k, dot;
Bool esc;
j = strlen(str);
*name = wmalloc(j);
@@ -1133,53 +1132,36 @@ UnescapeWM_CLASS(char *str, char **name, char **class)
**class = 0;
/* separate string in 2 parts */
esc = False;
dot = 0;
dot = -1;
for (i = 0; i < j; i++) {
if (!esc) {
if (str[i]=='\\') {
esc = True;
} else if (str[i]=='.') {
dot = i;
break;
}
} else {
esc = False;
}
if (str[i]=='\\') {
i++;
continue;
} else if (str[i]=='.') {
dot = i;
break;
}
}
/* unescape strings */
esc = False;
k = 0;
for (i = 0; i < dot; i++) {
if (!esc) {
if (str[i]=='\\') {
esc = True;
} else {
(*name)[k++] = str[i];
}
} else {
(*name)[k++] = str[i];
esc = False;
}
for (i=0, k=0; i < dot; i++) {
if (str[i]=='\\') {
continue;
} else {
(*name)[k++] = str[i];
}
}
(*name)[k] = 0;
esc = False;
k = 0;
for (i = dot+1; i<j; i++) {
if (!esc) {
if (str[i]=='\\') {
esc = True;
} else {
(*class)[k++] = str[i];
}
} else {
esc = False;
}
for (i=dot+1, k=0; i<j; i++) {
if (str[i]=='\\') {
continue;
} else {
(*class)[k++] = str[i];
}
}
(*class)[k] = 0;
if (!*name) {
wfree(*name);
*name = NULL;