From owner-cvs-all@FreeBSD.ORG Fri Jan 27 21:29:08 2006 Return-Path: X-Original-To: cvs-all@FreeBSD.org Delivered-To: cvs-all@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 58C7B16A420; Fri, 27 Jan 2006 21:29:08 +0000 (GMT) (envelope-from mux@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 09A2C43D45; Fri, 27 Jan 2006 21:29:08 +0000 (GMT) (envelope-from mux@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k0RLT7xM059565; Fri, 27 Jan 2006 21:29:07 GMT (envelope-from mux@repoman.freebsd.org) Received: (from mux@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k0RLT7aa059564; Fri, 27 Jan 2006 21:29:07 GMT (envelope-from mux) Message-Id: <200601272129.k0RLT7aa059564@repoman.freebsd.org> From: Maxime Henrion Date: Fri, 27 Jan 2006 21:29:07 +0000 (UTC) To: projects-committers@FreeBSD.org, cvs-projects@FreeBSD.org, cvs-all@FreeBSD.org X-FreeBSD-CVS-Branch: HEAD Cc: Subject: cvs commit: projects/csup keyword.c X-BeenThere: cvs-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: CVS commit messages for the entire tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 27 Jan 2006 21:29:08 -0000 mux 2006-01-27 21:29:07 UTC FreeBSD projects repository Modified files: csup keyword.c Log: Fix a subtle bug in the keyword expansion code that I introduced when making the code able to handle binary lines. When we found a pair of '$' characters and that we didn't find a tag matching what's between those characters, we need to retry searching at the second '$' character and not after it, or we fail to see tags in lines such as: $ $FreeBSD$ This fixes updating from RELENG_6_0 to HEAD. Revision Changes Path 1.23 +2 -2 projects/csup/keyword.c