X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=namedev_parse.c;h=3b14a6a50051a10e774b47f0dbbb5c0d8c311022;hp=7190cdd1a8702a538f5f454d96e3ca84a00f7b6f;hb=9f8dfa19cfd2b502bf794f39a421cbb7c4cc0404;hpb=a07dc29e602440541ce531e03737bc1f926a0ef3

diff --git a/namedev_parse.c b/namedev_parse.c
index 7190cdd1a..3b14a6a50 100644
--- a/namedev_parse.c
+++ b/namedev_parse.c
@@ -126,14 +126,15 @@ static int namedev_parse(const char *filename, void *data)
 	cur = 0;
 	lineno = 0;
 	while (cur < bufsize) {
+		int i, j;
+
 		count = buf_get_line(buf, bufsize, cur);
 		bufline = &buf[cur];
 		cur += count+1;
 		lineno++;
 
 		if (count >= LINE_SIZE) {
-			info("line too long, rule skipped %s, line %d",
-			     filename, lineno);
+			info("line too long, rule skipped %s, line %d", filename, lineno);
 			continue;
 		}
 
@@ -149,8 +150,14 @@ static int namedev_parse(const char *filename, void *data)
 		if (bufline[0] == COMMENT_CHARACTER)
 			continue;
 
-		strncpy(line, bufline, count);
-		line[count] = '\0';
+		/* skip backslash and newline from multi line rules */
+		for (i = j = 0; i < count; i++) {
+			if (bufline[i] == '\\' || bufline[i] == '\n')
+				continue;
+
+			line[j++] = bufline[i];
+		}
+		line[j] = '\0';
 		dbg_parse("read '%s'", line);
 
 		/* get all known keys */