From owner-svn-soc-all@FreeBSD.ORG Thu Sep 19 17:13:38 2013 Return-Path: Delivered-To: svn-soc-all@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 41499C2F for ; Thu, 19 Sep 2013 17:13:38 +0000 (UTC) (envelope-from dpl@FreeBSD.org) Received: from socsvn.freebsd.org (socsvn.freebsd.org [IPv6:2001:1900:2254:206a::50:2]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 2D8052BD3 for ; Thu, 19 Sep 2013 17:13:38 +0000 (UTC) Received: from socsvn.freebsd.org ([127.0.1.124]) by socsvn.freebsd.org (8.14.7/8.14.7) with ESMTP id r8JHDbTW082437 for ; Thu, 19 Sep 2013 17:13:37 GMT (envelope-from dpl@FreeBSD.org) Received: (from www@localhost) by socsvn.freebsd.org (8.14.7/8.14.6/Submit) id r8JHDbMT082430 for svn-soc-all@FreeBSD.org; Thu, 19 Sep 2013 17:13:37 GMT (envelope-from dpl@FreeBSD.org) Date: Thu, 19 Sep 2013 17:13:37 GMT Message-Id: <201309191713.r8JHDbMT082430@socsvn.freebsd.org> X-Authentication-Warning: socsvn.freebsd.org: www set sender to dpl@FreeBSD.org using -f From: dpl@FreeBSD.org To: svn-soc-all@FreeBSD.org Subject: socsvn commit: r257505 - in soc2013/dpl/head/usr.bin/bsdiff: bsdiff bspatch MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-soc-all@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the entire Summer of Code repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 19 Sep 2013 17:13:38 -0000 Author: dpl Date: Thu Sep 19 17:13:37 2013 New Revision: 257505 URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=257505 Log: Updated bsdiff and bspatch. Modified: soc2013/dpl/head/usr.bin/bsdiff/bsdiff/bsdiff.c soc2013/dpl/head/usr.bin/bsdiff/bspatch/bspatch.c Modified: soc2013/dpl/head/usr.bin/bsdiff/bsdiff/bsdiff.c ============================================================================== --- soc2013/dpl/head/usr.bin/bsdiff/bsdiff/bsdiff.c Thu Sep 19 16:22:05 2013 (r257504) +++ soc2013/dpl/head/usr.bin/bsdiff/bsdiff/bsdiff.c Thu Sep 19 17:13:37 2013 (r257505) @@ -27,8 +27,8 @@ #include __FBSDID("$FreeBSD$"); -#include #include +#include #include #include @@ -42,8 +42,6 @@ #define O_BINARY 0 #endif -#define DMIN(x,y) (((x)<(y)) ? (x) : (y)) - static void split(off_t *I,off_t *V,off_t start,off_t len,off_t h) { off_t i,j,k,x,tmp,jj,kk; @@ -172,7 +170,7 @@ }; x=st+(en-st)/2; - if(memcmp(old+I[x],new,DMIN(oldsize-I[x],newsize))<0) { + if(memcmp(old+I[x],new,MIN(oldsize-I[x],newsize))<0) { return search(I,old,oldsize,new,newsize,x,en,pos); } else { return search(I,old,oldsize,new,newsize,st,x,pos); @@ -232,14 +230,14 @@ cap_rights_init(&filerights, CAP_READ, CAP_SEEK); cap_rights_init(&pathrights, CAP_WRITE, CAP_SEEK); - if (cap_rights_limit(first, &filerights) < 0) + if (cap_rights_limit(first, &filerights) < 0 && errno != ENOSYS) err(1, "Couldn't limit fd"); - if (cap_rights_limit(second, &filerights) < 0) + if (cap_rights_limit(second, &filerights) < 0 && errno != ENOSYS) err(1, "Couldn't limit fd"); - if (cap_rights_limit(fileno(pf), &pathrights) < 0) + if (cap_rights_limit(fileno(pf), &pathrights) < 0 && errno != ENOSYS) err(1, "Couldn't limit fd"); - if (cap_enter() < 0) + if (cap_enter() < 0 && errno != ENOSYS) err(1, "Couldn't enter capability mode"); /* Allocate oldsize+1 bytes instead of oldsize bytes to ensure Modified: soc2013/dpl/head/usr.bin/bsdiff/bspatch/bspatch.c ============================================================================== --- soc2013/dpl/head/usr.bin/bsdiff/bspatch/bspatch.c Thu Sep 19 16:22:05 2013 (r257504) +++ soc2013/dpl/head/usr.bin/bsdiff/bspatch/bspatch.c Thu Sep 19 17:13:37 2013 (r257505) @@ -23,10 +23,9 @@ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. */ - -#include -#include __FBSDID("$FreeBSD$"); +#include +#include #include #include @@ -96,20 +95,20 @@ cap_rights_init(&patchr, CAP_READ, CAP_SEEK); cap_rights_init(&bzfiler, CAP_READ, CAP_SEEK); - if (cap_rights_limit(first, &firstr) < 0) + if (cap_rights_limit(first, &firstr) < 0 && errno != ENOSYS) err(1, "Couldn't limit fd"); - if (cap_rights_limit(second, &secondr) < 0) + if (cap_rights_limit(second, &secondr) < 0 && errno != ENOSYS) err(1, "Couldn't limit fd"); - if (cap_rights_limit(fileno(f), &patchr) < 0) + if (cap_rights_limit(fileno(f), &patchr) < 0 && errno != ENOSYS) err(1, "Couldn't limit fd"); - if (cap_rights_limit(fileno(cpf), &bzfiler) < 0) + if (cap_rights_limit(fileno(cpf), &bzfiler) < 0 && errno != ENOSYS) err(1, "Couldn't limit fd"); - if (cap_rights_limit(fileno(dpf), &bzfiler) < 0) + if (cap_rights_limit(fileno(dpf), &bzfiler) < 0 && errno != ENOSYS) err(1, "Couldn't limit fd"); - if (cap_rights_limit(fileno(epf), &bzfiler) < 0) + if (cap_rights_limit(fileno(epf), &bzfiler) < 0 && errno != ENOSYS) err(1, "Couldn't limit fd"); - if (cap_enter() < 0) + if (cap_enter() < 0 && errno != ENOSYS) err(1, "Couldn't enter capability mode"); /*