From owner-cvs-src@FreeBSD.ORG Wed Jul 25 16:45:10 2007 Return-Path: Delivered-To: cvs-src@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 4CB9416A419; Wed, 25 Jul 2007 16:45:10 +0000 (UTC) (envelope-from bzeeb-lists@lists.zabbadoz.net) Received: from mail.cksoft.de (mail.cksoft.de [62.111.66.27]) by mx1.freebsd.org (Postfix) with ESMTP id F1E8813C481; Wed, 25 Jul 2007 16:45:09 +0000 (UTC) (envelope-from bzeeb-lists@lists.zabbadoz.net) Received: from localhost (amavis.str.cksoft.de [192.168.74.71]) by mail.cksoft.de (Postfix) with ESMTP id 10AEC41C433; Wed, 25 Jul 2007 18:44:50 +0200 (CEST) X-Virus-Scanned: amavisd-new at cksoft.de Received: from mail.cksoft.de ([62.111.66.27]) by localhost (amavis.str.cksoft.de [192.168.74.71]) (amavisd-new, port 10024) with ESMTP id yBjNGvqjWcYe; Wed, 25 Jul 2007 18:44:47 +0200 (CEST) Received: by mail.cksoft.de (Postfix, from userid 66) id 4B35841C4A6; Wed, 25 Jul 2007 18:44:47 +0200 (CEST) Received: from maildrop.int.zabbadoz.net (maildrop.int.zabbadoz.net [10.111.66.10]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mail.int.zabbadoz.net (Postfix) with ESMTP id 50908444885; Wed, 25 Jul 2007 16:44:07 +0000 (UTC) Date: Wed, 25 Jul 2007 16:44:07 +0000 (UTC) From: "Bjoern A. Zeeb" X-X-Sender: bz@maildrop.int.zabbadoz.net To: Xin LI In-Reply-To: <46A76AC5.3040808@delphij.net> Message-ID: <20070725163806.Q31116@maildrop.int.zabbadoz.net> References: <200707150124.l6F1OkOw088572@repoman.freebsd.org> <20070725145935.J31116@maildrop.int.zabbadoz.net> <46A76A2C.2040209@delphij.net> <46A76AC5.3040808@delphij.net> MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII; format=flowed Cc: cvs-src@FreeBSD.ORG, src-committers@FreeBSD.ORG, Xin LI , cvs-all@FreeBSD.ORG Subject: Re: cvs commit: src/contrib/diff ABOUT-NLS AUTHORS COPYING ChangeLog FREEBSD-upgrade Makefile.am Makefile.in NEWS README THANKS TODO analyze.c bootstrap cmpbuf.c cmpbuf.h config.h config.hin configure configure.in context.c diagmeet.note diff.c diff.h ... 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: Wed, 25 Jul 2007 16:45:10 -0000 On Wed, 25 Jul 2007, Xin LI wrote: > The info page says: > > An exit status of 0 means no differences were found, 1 means some > differences were found, and 2 means trouble. Normally, differing > binary files count as trouble, but this can be altered by using the > `-a' or `--text' option, or the `-q' or `--brief' option. ah so the "definition" of 2 changed. It used to be: RETURN VALUE diff returns 0 if the files are identical or 1 if the files differ. If one or both of the files cannot be opened, then the return value is set to 2. > Do you think this is the problem? (i.e. does specifying -q changed the > behavior back to the previous?) Yes it does restore the behavior. I do not really understand what the description of -q/--brief has to do with binary files (I just tested that case), as the output stays the same for them with or without -q, only the return code seems to change. Funny thing;-) Thanks a lot for the fast reply! -- Bjoern A. Zeeb bzeeb at Zabbadoz dot NeT Software is harder than hardware so better get it right the first time.