From owner-svn-src-stable-9@FreeBSD.ORG  Mon Apr 29 21:04:37 2013
Return-Path: <owner-svn-src-stable-9@FreeBSD.ORG>
Delivered-To: svn-src-stable-9@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by hub.freebsd.org (Postfix) with ESMTP id BE418E68;
 Mon, 29 Apr 2013 21:04:37 +0000 (UTC)
 (envelope-from jkim@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id AFDAA11CC;
 Mon, 29 Apr 2013 21:04:37 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r3TL4boY085352;
 Mon, 29 Apr 2013 21:04:37 GMT (envelope-from jkim@svn.freebsd.org)
Received: (from jkim@localhost)
 by svn.freebsd.org (8.14.6/8.14.5/Submit) id r3TL4bu6085351;
 Mon, 29 Apr 2013 21:04:37 GMT (envelope-from jkim@svn.freebsd.org)
Message-Id: <201304292104.r3TL4bu6085351@svn.freebsd.org>
From: Jung-uk Kim <jkim@FreeBSD.org>
Date: Mon, 29 Apr 2013 21:04:37 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org
Subject: svn commit: r250066 - stable/9/usr.sbin/config
X-SVN-Group: stable-9
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-stable-9@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for only the 9-stable src tree
 <svn-src-stable-9.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-stable-9>, 
 <mailto:svn-src-stable-9-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable-9>
List-Post: <mailto:svn-src-stable-9@freebsd.org>
List-Help: <mailto:svn-src-stable-9-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-9>, 
 <mailto:svn-src-stable-9-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 29 Apr 2013 21:04:37 -0000

Author: jkim
Date: Mon Apr 29 21:04:37 2013
New Revision: 250066
URL: http://svnweb.freebsd.org/changeset/base/250066

Log:
  MFC:	r248777
  
  Loosen restrictions for quoted strings.  Now we can use more complex strings
  and "escaped" quote characters.

Modified:
  stable/9/usr.sbin/config/main.c
Directory Properties:
  stable/9/usr.sbin/config/   (props changed)

Modified: stable/9/usr.sbin/config/main.c
==============================================================================
--- stable/9/usr.sbin/config/main.c	Mon Apr 29 20:32:09 2013	(r250065)
+++ stable/9/usr.sbin/config/main.c	Mon Apr 29 21:04:37 2013	(r250066)
@@ -350,16 +350,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;