From owner-cvs-projects@FreeBSD.ORG Wed Mar 1 02:29:56 2006 Return-Path: X-Original-To: cvs-projects@FreeBSD.org Delivered-To: cvs-projects@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 8E51816A420; Wed, 1 Mar 2006 02:29:56 +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 5CA1943D46; Wed, 1 Mar 2006 02:29:56 +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 k212Tuh9086910; Wed, 1 Mar 2006 02:29:56 GMT (envelope-from mux@repoman.freebsd.org) Received: (from mux@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k212TuDr086909; Wed, 1 Mar 2006 02:29:56 GMT (envelope-from mux) Message-Id: <200603010229.k212TuDr086909@repoman.freebsd.org> From: Maxime Henrion Date: Wed, 1 Mar 2006 02:29:56 +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 config.c config.h main.c parse.y proto.c X-BeenThere: cvs-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: CVS commit messages for the projects tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 01 Mar 2006 02:29:56 -0000 mux 2006-03-01 02:29:56 UTC FreeBSD projects repository Modified files: csup config.c config.h main.c parse.y proto.c Log: - Introduce a new coll_override() function to override a collection with another one. - Use the new coll_override() in main() to remember the command line options that force an option or a value in all collections. Pass it to config_init() instead of all those boolean flags. - Shuffle some code in config_init() to make it a bit nicer and more close to what is done in CVSup. - Make it so the struct config is not a global variable and properly free() it along with all the collections after we are finished updating. The list of collections is still static and copied in the struct config once built, because of yacc. - Now that it's easy (one line to add) to do so, implement the -i option. This is used to restrict the updates to files that match the provided pattern (multiple patterns can be provided with multimple -i flags, and they will be OR'ed together). Revision Changes Path 1.45 +162 -104 projects/csup/config.c 1.33 +8 -3 projects/csup/config.h 1.33 +37 -14 projects/csup/main.c 1.15 +2 -7 projects/csup/parse.y 1.82 +3 -2 projects/csup/proto.c