socsvn commit: r257505 - in soc2013/dpl/head/usr.bin/bsdiff: bsdiff bspatch

[dpl at FreeBSD.org]

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 <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
-#include <sys/capability.h>
 #include <sys/types.h>
+#include <sys/capability.h>
 
 #include <bzlib.h>
 #include <err.h>
@@ -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 <sys/capability.h>
-#include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
+#include <sys/cdefs.h>
+#include <sys/capability.h>
 
 #include <bzlib.h>
 #include <stdlib.h>
@@ -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");
 
 	/*