Author: jkim
Date: Tue Mar 26 23:58:13 2013
New Revision: 248777
URL: http://svnweb.freebsd.org/changeset/base/248777
Log:
Loosen restrictions for quoted strings. Now we can use more complex strings
and "escaped" quote characters.
MFC after: 1 month
Modified:
head/usr.sbin/config/main.c
Modified: head/usr.sbin/config/main.c
==============================================================================
--- head/usr.sbin/config/main.c Tue Mar 26 23:11:30 2013 (r248776)
+++ head/usr.sbin/config/main.c Tue Mar 26 23:58:13 2013 (r248777)
@@ -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;
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
