2 files changed, 8 insertions, 41 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) {
diff --git a/sway/config.c b/sway/config.c
index c1eec22f..15108123 100644
--- a/sway/config.c
+++ b/sway/config.c
@@ -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 success = true;
-        bool multiline = false;
         enum cmd_status block = CMD_BLOCK_END;
 
         int line_number = 0;
-        char *line, *mlinebuf = NULL;
+        char *line;
         while (!feof(file)) {
                 line = read_line(file);
                 line_number++;
@@ -468,45 +467,6 @@ bool read_config(FILE *file, struct sway_config *config) {
                         free(line);
                         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);
                 switch(res->status) {
                 case CMD_FAILURE: