From owner-svn-src-all@FreeBSD.ORG  Wed Feb 11 22:59:25 2015
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 86A1DBAE;
 Wed, 11 Feb 2015 22:59:25 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 71CEDAC0;
 Wed, 11 Feb 2015 22:59:25 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t1BMxPYr073205;
 Wed, 11 Feb 2015 22:59:25 GMT (envelope-from gjb@FreeBSD.org)
Received: (from gjb@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id t1BMxPkK073204;
 Wed, 11 Feb 2015 22:59:25 GMT (envelope-from gjb@FreeBSD.org)
Message-Id: <201502112259.t1BMxPkK073204@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: gjb set sender to gjb@FreeBSD.org
 using -f
From: Glen Barber <gjb@FreeBSD.org>
Date: Wed, 11 Feb 2015 22:59:25 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r278603 - head/usr.bin/svn/svn
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 11 Feb 2015 22:59:25 -0000

Author: gjb
Date: Wed Feb 11 22:59:24 2015
New Revision: 278603
URL: https://svnweb.freebsd.org/changeset/base/278603

Log:
  Ensure ORGANIZATION_NAME is quoted when ORGANIZATION
  could contain strings of two or more words.
  
  Reviewed by:	peter
  Reported by:	karl@denninger.net
  PR:		197540
  MFC after:	3 days
  Sponsored by:	The FreeBSD Foundation

Modified:
  head/usr.bin/svn/svn/Makefile

Modified: head/usr.bin/svn/svn/Makefile
==============================================================================
--- head/usr.bin/svn/svn/Makefile	Wed Feb 11 22:55:24 2015	(r278602)
+++ head/usr.bin/svn/svn/Makefile	Wed Feb 11 22:59:24 2015	(r278603)
@@ -54,8 +54,13 @@ DPSRCS+=	freebsd-organization.h
 CLEANFILES+=	freebsd-organization.h
 CFLAGS+=	-I. -DHAS_ORGANIZATION_NAME
 freebsd-organization.h:
-	@echo '#define ORGANIZATION_NAME ${ORGANIZATION}' \
+	@echo '#define ORGANIZATION_NAME	${ORGANIZATION}' \
 	    > freebsd-organization.h
+	@# Remove quotes from ORGANIZATION_NAME if they exist.
+	@sed -i '' -e 's,",,g' freebsd-organization.h
+	@# Quote ORGANIZATION_NAME, in case it is two or more words.
+	@sed -i '' -E 's,	,	",' freebsd-organization.h
+	@sed -i '' -E 's,$$,",' freebsd-organization.h
 .endif
 
 svnlite.1: svn.1