Module Name: src
Committed By: christos
Date: Fri Feb 10 18:11:18 UTC 2017
Modified Files:
src/external/bsd/file/dist/src: der.c
src/external/bsd/file/lib: Makefile shlib_version
Log Message:
fix der.c bump shared library
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r1.2 src/external/bsd/file/dist/src/der.c
cvs rdiff -u -r1.7 -r1.8 src/external/bsd/file/lib/Makefile
cvs rdiff -u -r1.5 -r1.6 src/external/bsd/file/lib/shlib_version
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/file/dist/src/der.c
diff -u src/external/bsd/file/dist/src/der.c:1.1.1.1 src/external/bsd/file/dist/src/der.c:1.2
--- src/external/bsd/file/dist/src/der.c:1.1.1.1 Fri Feb 10 12:42:57 2017
+++ src/external/bsd/file/dist/src/der.c Fri Feb 10 13:11:17 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: der.c,v 1.1.1.1 2017/02/10 17:42:57 christos Exp $ */
+/* $NetBSD: der.c,v 1.2 2017/02/10 18:11:17 christos Exp $ */
/*-
* Copyright (c) 2016 Christos Zoulas
@@ -40,7 +40,7 @@
#if 0
FILE_RCSID("@(#)$File: der.c,v 1.11 2016/11/07 15:51:23 christos Exp $")
#else
-__RCSID("$NetBSD: der.c,v 1.1.1.1 2017/02/10 17:42:57 christos Exp $");
+__RCSID("$NetBSD: der.c,v 1.2 2017/02/10 18:11:17 christos Exp $");
#endif
#endif
#endif
@@ -207,7 +207,7 @@ getlength(const uint8_t *c, size_t *p, s
if (*p + len >= l)
return DER_BAD;
- return len;
+ return CAST(uint32_t, len);
}
static const char *
@@ -266,12 +266,12 @@ der_offs(struct magic_set *ms, struct ma
#endif
if (m->cont_level != 0) {
if (offs + tlen > nbytes)
- return DER_BAD;
- ms->c.li[m->cont_level - 1].off = offs + tlen;
+ return -1;
+ ms->c.li[m->cont_level - 1].off = CAST(int, offs + tlen);
DPRINTF(("cont_level[%u] = %u\n", m->cont_level - 1,
ms->c.li[m->cont_level - 1].off));
}
- return offs;
+ return CAST(int32_t, offs);
}
int
Index: src/external/bsd/file/lib/Makefile
diff -u src/external/bsd/file/lib/Makefile:1.7 src/external/bsd/file/lib/Makefile:1.8
--- src/external/bsd/file/lib/Makefile:1.7 Tue Jan 10 08:51:36 2017
+++ src/external/bsd/file/lib/Makefile Fri Feb 10 13:11:18 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2017/01/10 13:51:36 christos Exp $
+# $NetBSD: Makefile,v 1.8 2017/02/10 18:11:18 christos Exp $
#
USE_FORT?= yes # data driven bugs?
@@ -19,7 +19,7 @@ CPPFLAGS+=-I.
SRCS= magic.c apprentice.c softmagic.c ascmagic.c compress.c \
is_tar.c readelf.c print.c fsmagic.c apptype.c funcs.c \
- cdf.c readcdf.c cdf_time.c encoding.c
+ cdf.c readcdf.c cdf_time.c encoding.c der.c
MAN= libmagic.3
MLINKS+= libmagic.3 magic_open.3 \
libmagic.3 magic_close.3 \
Index: src/external/bsd/file/lib/shlib_version
diff -u src/external/bsd/file/lib/shlib_version:1.5 src/external/bsd/file/lib/shlib_version:1.6
--- src/external/bsd/file/lib/shlib_version:1.5 Fri Jan 2 16:15:32 2015
+++ src/external/bsd/file/lib/shlib_version Fri Feb 10 13:11:18 2017
@@ -1,4 +1,4 @@
-# $NetBSD: shlib_version,v 1.5 2015/01/02 21:15:32 christos Exp $
+# $NetBSD: shlib_version,v 1.6 2017/02/10 18:11:18 christos Exp $
#
major=5
-minor=1
+minor=2
