From owner-svn-src-projects@FreeBSD.ORG  Sat Jan  3 12:09:18 2009
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id D66A4106567E;
	Sat,  3 Jan 2009 12:09:18 +0000 (UTC)
	(envelope-from lulf@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id C34478FC1B;
	Sat,  3 Jan 2009 12:09:18 +0000 (UTC)
	(envelope-from lulf@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n03C9IQb027427;
	Sat, 3 Jan 2009 12:09:18 GMT (envelope-from lulf@svn.freebsd.org)
Received: (from lulf@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n03C9IMr027426;
	Sat, 3 Jan 2009 12:09:18 GMT (envelope-from lulf@svn.freebsd.org)
Message-Id: <200901031209.n03C9IMr027426@svn.freebsd.org>
From: Ulf Lilleengen <lulf@FreeBSD.org>
Date: Sat, 3 Jan 2009 12:09:18 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r186718 - projects/csup_cvsmode/contrib/csup
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
	tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 03 Jan 2009 12:09:20 -0000

Author: lulf
Date: Sat Jan  3 12:09:18 2009
New Revision: 186718
URL: http://svn.freebsd.org/changeset/base/186718

Log:
  - A bit missing from the previous commit. The '@'s from the string token must be
    stripped before encoding the expansion mode.

Modified:
  projects/csup_cvsmode/contrib/csup/rcsfile.c

Modified: projects/csup_cvsmode/contrib/csup/rcsfile.c
==============================================================================
--- projects/csup_cvsmode/contrib/csup/rcsfile.c	Sat Jan  3 11:35:31 2009	(r186717)
+++ projects/csup_cvsmode/contrib/csup/rcsfile.c	Sat Jan  3 12:09:18 2009	(r186718)
@@ -921,6 +921,7 @@ rcsfile_getdelta(struct rcsfile *rf, cha
 void
 rcsfile_setval(struct rcsfile *rf, int field, char *val)
 {
+	size_t len;
 
 	switch (field) {
 		case RCSFILE_HEAD:
@@ -943,6 +944,9 @@ rcsfile_setval(struct rcsfile *rf, int f
 			rf->comment = xstrdup(val);
 		break;
 		case RCSFILE_EXPAND:
+			len = strlen(val) - 1;
+			val++;
+			val[len - 1] = '\0';
 			rf->expand = keyword_decode_expand(val);
 		break;
 		case RCSFILE_DESC: