From 81e4e017b66de09157cb6398f88aa05aa67444a3 Mon Sep 17 00:00:00 2001 From: Glen Barber Date: Wed, 11 Feb 2015 22:59:24 +0000 Subject: [PATCH] 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 --- usr.bin/svn/svn/Makefile | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/usr.bin/svn/svn/Makefile b/usr.bin/svn/svn/Makefile index cdac81d7a4ae..30307be2c04c 100644 --- a/usr.bin/svn/svn/Makefile +++ b/usr.bin/svn/svn/Makefile @@ -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