aboutsummaryrefslogtreecommitdiff
path: root/common
diff options
context:
space:
mode:
authorDenis Doria <denisdoria@gmail.com>2016-06-06 09:17:01 +0200
committerDenis Doria <denisdoria@gmail.com>2016-06-06 09:17:01 +0200
commitcdd8664198009c705716df728fcfa1450620f18b (patch)
treea18924024087a5834808618e6d47bae9f69e7fea /common
parent3c3e98b1a3beda5f17f689bfad64dde3bc0bf6ac (diff)
parentcb14f5f5765a71630ea3c4bd2143fcc1cd4a2e57 (diff)
downloadsway-cdd8664198009c705716df728fcfa1450620f18b.tar.xz
Merge branch 'master' into variables_corner_cases
Diffstat (limited to 'common')
-rw-r--r--common/readline.c7
1 files changed, 7 insertions, 0 deletions
diff --git a/common/readline.c b/common/readline.c
index 76ed6926..5106172c 100644
--- a/common/readline.c
+++ b/common/readline.c
@@ -5,17 +5,24 @@
char *read_line(FILE *file) {
size_t length = 0, size = 128;
char *string = malloc(size);
+ char lastChar = '\0';
if (!string) {
return NULL;
}
while (1) {
int c = getc(file);
+ if (c == '\n' && lastChar == '\\'){
+ --length; // Ignore last character.
+ lastChar = '\0';
+ continue;
+ }
if (c == EOF || c == '\n' || c == '\0') {
break;
}
if (c == '\r') {
continue;
}
+ lastChar = c;
if (length == size) {
char *new_string = realloc(string, size *= 2);
if (!new_string) {