From owner-cvs-src@FreeBSD.ORG Tue May 30 19:22:20 2006 Return-Path: X-Original-To: cvs-src@freebsd.org Delivered-To: cvs-src@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 290F416A71F; Tue, 30 May 2006 19:22:20 +0000 (UTC) (envelope-from peterjeremy@optushome.com.au) Received: from mail11.syd.optusnet.com.au (mail11.syd.optusnet.com.au [211.29.132.192]) by mx1.FreeBSD.org (Postfix) with ESMTP id 965AC43D8F; Tue, 30 May 2006 19:21:48 +0000 (GMT) (envelope-from peterjeremy@optushome.com.au) Received: from turion.vk2pj.dyndns.org (c220-239-19-236.belrs4.nsw.optusnet.com.au [220.239.19.236]) by mail11.syd.optusnet.com.au (8.12.11/8.12.11) with ESMTP id k4UJLJWS009841 (version=TLSv1/SSLv3 cipher=EDH-RSA-DES-CBC3-SHA bits=168 verify=NO); Wed, 31 May 2006 05:21:19 +1000 Received: from turion.vk2pj.dyndns.org (localhost.vk2pj.dyndns.org [127.0.0.1]) by turion.vk2pj.dyndns.org (8.13.6/8.13.6) with ESMTP id k4UJLILV003141; Wed, 31 May 2006 05:21:18 +1000 (EST) (envelope-from peter@turion.vk2pj.dyndns.org) Received: (from peter@localhost) by turion.vk2pj.dyndns.org (8.13.6/8.13.6/Submit) id k4UJLIwT003140; Wed, 31 May 2006 05:21:18 +1000 (EST) (envelope-from peter) Date: Wed, 31 May 2006 05:21:18 +1000 From: Peter Jeremy To: Andrey Chernov , Craig Rodrigues , src-committers@freebsd.org, cvs-src@freebsd.org, cvs-all@freebsd.org Message-ID: <20060530192118.GB723@turion.vk2pj.dyndns.org> References: <200605261244.k4QCiCsl057619@repoman.freebsd.org> <20060529193947.M63890@mp2.macomnet.net> <20060529215827.D78736@mp2.macomnet.net> <20060530034531.GA36462@crodrigues.org> <20060530041210.GA48857@nagual.pp.ru> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20060530041210.GA48857@nagual.pp.ru> X-PGP-Key: http://members.optusnet.com.au/peterjeremy/pubkey.asc User-Agent: Mutt/1.5.11 Cc: Subject: Re: cvs commit: src/sys/ufs/ffs ffs_vfsops.c X-BeenThere: cvs-src@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: CVS commit messages for the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 30 May 2006 19:22:38 -0000 On Tue, 2006-May-30 08:12:10 +0400, Andrey Chernov wrote: >On Mon, May 29, 2006 at 11:45:31PM -0400, Craig Rodrigues wrote: > >> + if (strcmp(argv[i], "ro") == 0 && >> + strcmp(argv[i-1], "-o") == 0) { >> + return 1; > >It looks like hack. There is comma separated list for -o needs to be fully >parsed, f.e. '-o acls,ro' There's already code in mount(8) that understands how to merge conflicting option lists (from the command line and fstab). It needs to be taught that: - -r, ro and norw are equivalent - rw and noro are equivalent - -r/ro/norw and rw/noro are complementary. -- Peter Jeremy