aboutsummaryrefslogtreecommitdiff
path: root/usr.sbin/config
diff options
context:
space:
mode:
authorJung-uk Kim <jkim@FreeBSD.org>2013-03-26 23:58:13 +0000
committerJung-uk Kim <jkim@FreeBSD.org>2013-03-26 23:58:13 +0000
commit52569792bd144b5d47e0eac9f77a8b4793cf3e0a (patch)
treefdd350b70419a06299c6bfa60bee7b979168452b /usr.sbin/config
parent91ba008fc5d755c689431f25a67d7003b1db6146 (diff)
Notes
Diffstat (limited to 'usr.sbin/config')
-rw-r--r--usr.sbin/config/main.c12
1 files changed, 10 insertions, 2 deletions
diff --git a/usr.sbin/config/main.c b/usr.sbin/config/main.c
index 14061c2081c6..3ed5495cdd66 100644
--- a/usr.sbin/config/main.c
+++ b/usr.sbin/config/main.c
@@ -351,16 +351,24 @@ begin:
if (ch == '"' || ch == '\'') {
int quote = ch;
+ escaped_nl = 0;
while ((ch = getc(fp)) != EOF) {
- if (ch == quote)
+ if (ch == quote && !escaped_nl)
break;
- if (ch == '\n') {
+ if (ch == '\n' && !escaped_nl) {
*cp = 0;
printf("config: missing quote reading `%s'\n",
line);
exit(2);
}
+ if (ch == '\\' && !escaped_nl) {
+ escaped_nl = 1;
+ continue;
+ }
+ if (ch != quote && escaped_nl)
+ *cp++ = '\\';
*cp++ = ch;
+ escaped_nl = 0;
}
} else {
*cp++ = ch;