mirrors/sway
1
0
Fork 0
mirror of https://github.com/swaywm/sway.git synced 2025-02-05 01:35:07 +01:00
Code Issues Projects Releases Packages Wiki Activity

Common: Readline: Ignore newline on '\' escaped line ends.

Browse source 
Escape line return when reading from a file with the '\' character.
Similar to shell scripts.

Signed-off-by: Roosembert Palacios <roosembert.palacios@epfl.ch>
This commit is contained in:
Roosembert Palacios 2016-06-06 00:17:27 +02:00
parent e8c0ef98b1
commit 230591fa4e
Failed to generate hash of commit
2 changed files with 8 additions and 41 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
common/readline.c
View file

@ -5,17 +5,24 @@
char *read_line(FILE *file) { char *read_line(FILE *file) {
size_t length = 0, size = 128; size_t length = 0, size = 128;
char *string = malloc(size); char *string = malloc(size);
char lastChar = '\0';
if (!string) { if (!string) {
return NULL; return NULL;
} }
while (1) { while (1) {
int c = getc(file); int c = getc(file);
if (c == '\n' && lastChar == '\\'){
--length; // Ignore last character.
lastChar = '\0';
continue;
}
if (c == EOF || c == '\n' || c == '\0') { if (c == EOF || c == '\n' || c == '\0') {
break; break;
} }
if (c == '\r') { if (c == '\r') {
continue; continue;
} }
lastChar = c;
if (length == size) { if (length == size) {
char *new_string = realloc(string, size *= 2); char *new_string = realloc(string, size *= 2);
if (!new_string) { if (!new_string) {

42
sway/config.c
View file

@ -455,11 +455,10 @@ bool load_include_configs(const char *path, struct sway_config *config) {
bool read_config(FILE *file, struct sway_config *config) { bool read_config(FILE *file, struct sway_config *config) {
bool success = true; bool success = true;
bool multiline = false;
enum cmd_status block = CMD_BLOCK_END; enum cmd_status block = CMD_BLOCK_END;
int line_number = 0; int line_number = 0;
char *line, *mlinebuf = NULL; char *line;
while (!feof(file)) { while (!feof(file)) {
line = read_line(file); line = read_line(file);
line_number++; line_number++;
@ -468,45 +467,6 @@ bool read_config(FILE *file, struct sway_config *config) {
free(line); free(line);
continue; continue;
} }
size_t length = strlen(line);
if (line[length-1] == '\\') {
// Start of multiline
if (feof(file)){
sway_log(L_ERROR, "Error on line %i '%s': Unexpected EOF on "\
"multiline command", line_number, line);
free(line);
continue;
}
line[length-1] = '\0';
multiline = true;
} else
multiline = false;
if (multiline || mlinebuf){
size_t mlinebuf_length;
if (mlinebuf)
mlinebuf_length = strlen(mlinebuf);
else
mlinebuf_length = 0;
char *tmp = malloc(mlinebuf_length+length+1); // + '\0'
tmp[0]='\0'; // if mlinebuf_length==0 strncpy won't do anything. Make a null string.
strncpy(tmp, mlinebuf, mlinebuf_length);
tmp[mlinebuf_length]='\0'; // strncpy won't add '\0' at the end...
strcat(tmp, line);
if (mlinebuf)
free(mlinebuf);
free(line);
mlinebuf = tmp;
if (multiline) // The following line is part of a multi line config.
continue;
else { // This is the last line of a multi line config.
line = mlinebuf;
sway_log(L_INFO, "Processing parsed multiline command '%s'", line);
mlinebuf = NULL;
}
}
struct cmd_results *res = config_command(line, block); struct cmd_results *res = config_command(line, block);
switch(res->status) { switch(res->status) {
case CMD_FAILURE: case CMD_FAILURE: