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

put strip_whitespace back

Browse source
This commit is contained in:
taiyu 2015-09-07 14:40:23 -07:00
parent 71af5b7dde
commit 47ff000697
2 changed files with 15 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
sway/config.c
View file

@ -230,6 +230,7 @@ bool read_config(FILE *file, bool is_active) {
char *line; char *line;
while (!feof(file)) { while (!feof(file)) {
line = read_line(file); line = read_line(file);
line = strip_whitespace(line);
line = strip_comments(line); line = strip_comments(line);
if (line[0] == '\0') { if (line[0] == '\0') {
goto _continue; goto _continue;

23
sway/stringop.c
View file

@ -11,16 +11,21 @@ const char *whitespace = " \f\n\r\t\v";
/* Note: This returns 8 characters for trimmed_start per tab character. */ /* Note: This returns 8 characters for trimmed_start per tab character. */
char *strip_whitespace(char *_str) { char *strip_whitespace(char *_str) {
int ws = strspn(_str, whitespace); if (*_str == '\0')
int len = strlen(_str) - ws + 1; return _str;
sway_log(L_DEBUG,"%d, %d..",ws,len); char *strold = _str;
char *str = malloc(len); while (*_str == ' ' || *_str == '\t') {
strcpy(str, _str+ws); _str++;
free(_str); }
char *str = malloc(strlen(_str) + 1);
strcpy(str, _str);
free(strold);
int i;
for (i = 0; str[i] != '\0'; ++i);
do { do {
len--; i--;
} while (len >= 0 && (str[len] == ' ' || str[len] == '\t')); } while (i >= 0 && (str[i] == ' ' || str[i] == '\t'));
str[len + 1] = '\0'; str[i + 1] = '\0';
return str; return str;
} }