Module Name: src
Committed By: christos
Date: Wed Sep 24 18:16:37 UTC 2014
Modified Files:
src/distrib/sets/lists/base: ad.aarch64 ad.arm ad.mips ad.powerpc
ad.riscv md.amd64 md.sparc64 shl.mi
src/distrib/sets/lists/comp: mi
src/distrib/sets/lists/debug: ad.aarch64 ad.arm ad.mips ad.powerpc
ad.riscv md.amd64 md.sparc64 shl.mi
src/include: string.h
src/lib/libc: shlib_version
src/lib/libc/string: Makefile.inc strstr.3
Log Message:
add strnstr from FreeBSD
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/distrib/sets/lists/base/ad.aarch64
cvs rdiff -u -r1.54 -r1.55 src/distrib/sets/lists/base/ad.arm
cvs rdiff -u -r1.49 -r1.50 src/distrib/sets/lists/base/ad.mips
cvs rdiff -u -r1.18 -r1.19 src/distrib/sets/lists/base/ad.powerpc
cvs rdiff -u -r1.1 -r1.2 src/distrib/sets/lists/base/ad.riscv
cvs rdiff -u -r1.245 -r1.246 src/distrib/sets/lists/base/md.amd64
cvs rdiff -u -r1.233 -r1.234 src/distrib/sets/lists/base/md.sparc64
cvs rdiff -u -r1.714 -r1.715 src/distrib/sets/lists/base/shl.mi
cvs rdiff -u -r1.1912 -r1.1913 src/distrib/sets/lists/comp/mi
cvs rdiff -u -r1.4 -r1.5 src/distrib/sets/lists/debug/ad.aarch64
cvs rdiff -u -r1.43 -r1.44 src/distrib/sets/lists/debug/ad.arm
cvs rdiff -u -r1.39 -r1.40 src/distrib/sets/lists/debug/ad.mips
cvs rdiff -u -r1.19 -r1.20 src/distrib/sets/lists/debug/ad.powerpc
cvs rdiff -u -r1.1 -r1.2 src/distrib/sets/lists/debug/ad.riscv
cvs rdiff -u -r1.63 -r1.64 src/distrib/sets/lists/debug/md.amd64
cvs rdiff -u -r1.62 -r1.63 src/distrib/sets/lists/debug/md.sparc64
cvs rdiff -u -r1.73 -r1.74 src/distrib/sets/lists/debug/shl.mi
cvs rdiff -u -r1.48 -r1.49 src/include/string.h
cvs rdiff -u -r1.254 -r1.255 src/lib/libc/shlib_version
cvs rdiff -u -r1.79 -r1.80 src/lib/libc/string/Makefile.inc
cvs rdiff -u -r1.10 -r1.11 src/lib/libc/string/strstr.3
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/sets/lists/base/ad.aarch64
diff -u src/distrib/sets/lists/base/ad.aarch64:1.5 src/distrib/sets/lists/base/ad.aarch64:1.6
--- src/distrib/sets/lists/base/ad.aarch64:1.5 Wed Sep 10 18:50:25 2014
+++ src/distrib/sets/lists/base/ad.aarch64 Wed Sep 24 14:16:37 2014
@@ -1,4 +1,4 @@
-# $NetBSD: ad.aarch64,v 1.5 2014/09/10 22:50:25 matt Exp $
+# $NetBSD: ad.aarch64,v 1.6 2014/09/24 18:16:37 christos Exp $
./lib/eabi base-compat-shlib compat
./lib/eabi/npf base-npf-shlib compat
./lib/eabi/npf/ext_log.so base-npf-shlib compat,pic
@@ -108,7 +108,7 @@
./usr/lib/eabi/libc++.so.1 base-compat-shlib compat,pic,libcxx
./usr/lib/eabi/libc++.so.1.0 base-compat-shlib compat,pic,libcxx
./usr/lib/eabi/libc.so.12 base-compat-shlib compat,pic
-./usr/lib/eabi/libc.so.12.193 base-compat-shlib compat,pic
+./usr/lib/eabi/libc.so.12.194 base-compat-shlib compat,pic
./usr/lib/eabi/libcom_err.so.7 base-compat-shlib compat,pic,kerberos
./usr/lib/eabi/libcom_err.so.7.0 base-compat-shlib compat,pic,kerberos
./usr/lib/eabi/libcrypt.so.1 base-compat-shlib compat,pic
@@ -422,7 +422,7 @@
./usr/lib/eabihf/libc++.so.1 base-compat-shlib compat,pic,libcxx
./usr/lib/eabihf/libc++.so.1.0 base-compat-shlib compat,pic,libcxx
./usr/lib/eabihf/libc.so.12 base-compat-shlib compat,pic
-./usr/lib/eabihf/libc.so.12.193 base-compat-shlib compat,pic
+./usr/lib/eabihf/libc.so.12.194 base-compat-shlib compat,pic
./usr/lib/eabihf/libcom_err.so.7 base-compat-shlib compat,pic,kerberos
./usr/lib/eabihf/libcom_err.so.7.0 base-compat-shlib compat,pic,kerberos
./usr/lib/eabihf/libcrypt.so.1 base-compat-shlib compat,pic
@@ -736,7 +736,7 @@
./usr/lib/oabi/libc++.so.1 base-compat-shlib compat,pic,libcxx
./usr/lib/oabi/libc++.so.1.0 base-compat-shlib compat,pic,libcxx
./usr/lib/oabi/libc.so.12 base-compat-shlib compat,pic
-./usr/lib/oabi/libc.so.12.193 base-compat-shlib compat,pic
+./usr/lib/oabi/libc.so.12.194 base-compat-shlib compat,pic
./usr/lib/oabi/libcom_err.so.7 base-compat-shlib compat,pic,kerberos
./usr/lib/oabi/libcom_err.so.7.0 base-compat-shlib compat,pic,kerberos
./usr/lib/oabi/libcrypt.so.1 base-compat-shlib compat,pic
Index: src/distrib/sets/lists/base/ad.arm
diff -u src/distrib/sets/lists/base/ad.arm:1.54 src/distrib/sets/lists/base/ad.arm:1.55
--- src/distrib/sets/lists/base/ad.arm:1.54 Sun Aug 10 04:07:50 2014
+++ src/distrib/sets/lists/base/ad.arm Wed Sep 24 14:16:37 2014
@@ -1,4 +1,4 @@
-# $NetBSD: ad.arm,v 1.54 2014/08/10 08:07:50 spz Exp $
+# $NetBSD: ad.arm,v 1.55 2014/09/24 18:16:37 christos Exp $
./lib/oabi base-compat-shlib compat
./lib/oabi/npf base-npf-shlib compat
./lib/oabi/npf/ext_log.so base-npf-shlib compat,pic
@@ -92,7 +92,7 @@
./usr/lib/oabi/libc++.so.1 base-compat-shlib compat,pic,libcxx
./usr/lib/oabi/libc++.so.1.0 base-compat-shlib compat,pic,libcxx
./usr/lib/oabi/libc.so.12 base-compat-shlib compat,pic
-./usr/lib/oabi/libc.so.12.193 base-compat-shlib compat,pic
+./usr/lib/oabi/libc.so.12.194 base-compat-shlib compat,pic
./usr/lib/oabi/libc_vfp.so.0 base-compat-shlib compat,pic
./usr/lib/oabi/libc_vfp.so.0.0 base-compat-shlib compat,pic
./usr/lib/oabi/libcom_err.so.7 base-compat-shlib compat,pic,kerberos
Index: src/distrib/sets/lists/base/ad.mips
diff -u src/distrib/sets/lists/base/ad.mips:1.49 src/distrib/sets/lists/base/ad.mips:1.50
--- src/distrib/sets/lists/base/ad.mips:1.49 Fri Aug 22 06:51:38 2014
+++ src/distrib/sets/lists/base/ad.mips Wed Sep 24 14:16:37 2014
@@ -1,4 +1,4 @@
-# $NetBSD: ad.mips,v 1.49 2014/08/22 10:51:38 apb Exp $
+# $NetBSD: ad.mips,v 1.50 2014/09/24 18:16:37 christos Exp $
./lib/64 base-compat-shlib compat,arch64
./lib/64/npf base-npf-shlib compat,arch64
./lib/64/npf/ext_log.so base-npf-shlib compat,pic,arch64
@@ -94,7 +94,7 @@
./usr/lib/64/libc++.so.1 base-compat-shlib compat,pic,libcxx,arch64
./usr/lib/64/libc++.so.1.0 base-compat-shlib compat,pic,libcxx,arch64
./usr/lib/64/libc.so.12 base-compat-shlib compat,pic,arch64
-./usr/lib/64/libc.so.12.193 base-compat-shlib compat,pic,arch64
+./usr/lib/64/libc.so.12.194 base-compat-shlib compat,pic,arch64
./usr/lib/64/libcom_err.so.7 base-compat-shlib compat,pic,kerberos,arch64
./usr/lib/64/libcom_err.so.7.0 base-compat-shlib compat,pic,kerberos,arch64
./usr/lib/64/libcrypt.so.1 base-compat-shlib compat,pic,arch64
@@ -441,7 +441,7 @@
./usr/lib/o32/libc++.so.1 base-compat-shlib compat,pic,libcxx,arch64
./usr/lib/o32/libc++.so.1.0 base-compat-shlib compat,pic,libcxx,arch64
./usr/lib/o32/libc.so.12 base-compat-shlib compat,pic,arch64
-./usr/lib/o32/libc.so.12.193 base-compat-shlib compat,pic,arch64
+./usr/lib/o32/libc.so.12.194 base-compat-shlib compat,pic,arch64
./usr/lib/o32/libcom_err.so.7 base-compat-shlib compat,pic,kerberos,arch64
./usr/lib/o32/libcom_err.so.7.0 base-compat-shlib compat,pic,kerberos,arch64
./usr/lib/o32/libcrypt.so.1 base-compat-shlib compat,pic,arch64
Index: src/distrib/sets/lists/base/ad.powerpc
diff -u src/distrib/sets/lists/base/ad.powerpc:1.18 src/distrib/sets/lists/base/ad.powerpc:1.19
--- src/distrib/sets/lists/base/ad.powerpc:1.18 Fri Aug 22 06:51:38 2014
+++ src/distrib/sets/lists/base/ad.powerpc Wed Sep 24 14:16:37 2014
@@ -1,4 +1,4 @@
-# $NetBSD: ad.powerpc,v 1.18 2014/08/22 10:51:38 apb Exp $
+# $NetBSD: ad.powerpc,v 1.19 2014/09/24 18:16:37 christos Exp $
./lib/powerpc base-npf-shlib compat,arch64
./lib/powerpc/npf base-npf-shlib compat,arch64
./lib/powerpc/npf/ext_log.so base-npf-shlib compat,arch64,pic
@@ -83,7 +83,7 @@
./usr/lib/powerpc/libc++.so.1 base-compat-shlib compat,arch64,pic,libcxx
./usr/lib/powerpc/libc++.so.1.0 base-compat-shlib compat,arch64,pic,libcxx
./usr/lib/powerpc/libc.so.12 base-compat-shlib compat,arch64,pic
-./usr/lib/powerpc/libc.so.12.193 base-compat-shlib compat,arch64,pic
+./usr/lib/powerpc/libc.so.12.194 base-compat-shlib compat,arch64,pic
./usr/lib/powerpc/libcom_err.so.7 base-compat-shlib compat,arch64,pic,kerberos
./usr/lib/powerpc/libcom_err.so.7.0 base-compat-shlib compat,arch64,pic,kerberos
./usr/lib/powerpc/libcrypt.so.1 base-compat-shlib compat,arch64,pic
Index: src/distrib/sets/lists/base/ad.riscv
diff -u src/distrib/sets/lists/base/ad.riscv:1.1 src/distrib/sets/lists/base/ad.riscv:1.2
--- src/distrib/sets/lists/base/ad.riscv:1.1 Fri Sep 19 13:36:24 2014
+++ src/distrib/sets/lists/base/ad.riscv Wed Sep 24 14:16:37 2014
@@ -1,4 +1,4 @@
-# $NetBSD: ad.riscv,v 1.1 2014/09/19 17:36:24 matt Exp $
+# $NetBSD: ad.riscv,v 1.2 2014/09/24 18:16:37 christos Exp $
./lib/rv32 base-compat-shlib compat,arch64
./lib/rv32/npf base-npf-shlib compat,arch64
./lib/rv32/npf/ext_log.so base-npf-shlib compat,pic,arch64
@@ -82,7 +82,7 @@
./usr/lib/rv32/libc++.so.1 base-compat-shlib compat,pic,libcxx,arch64
./usr/lib/rv32/libc++.so.1.0 base-compat-shlib compat,pic,libcxx,arch64
./usr/lib/rv32/libc.so.12 base-compat-shlib compat,pic,arch64
-./usr/lib/rv32/libc.so.12.193 base-compat-shlib compat,pic,arch64
+./usr/lib/rv32/libc.so.12.194 base-compat-shlib compat,pic,arch64
./usr/lib/rv32/libcom_err.so.7 base-compat-shlib compat,pic,kerberos,arch64
./usr/lib/rv32/libcom_err.so.7.0 base-compat-shlib compat,pic,kerberos,arch64
./usr/lib/rv32/libcrypt.so.1 base-compat-shlib compat,pic,arch64
Index: src/distrib/sets/lists/base/md.amd64
diff -u src/distrib/sets/lists/base/md.amd64:1.245 src/distrib/sets/lists/base/md.amd64:1.246
--- src/distrib/sets/lists/base/md.amd64:1.245 Fri Aug 22 06:51:38 2014
+++ src/distrib/sets/lists/base/md.amd64 Wed Sep 24 14:16:37 2014
@@ -1,4 +1,4 @@
-# $NetBSD: md.amd64,v 1.245 2014/08/22 10:51:38 apb Exp $
+# $NetBSD: md.amd64,v 1.246 2014/09/24 18:16:37 christos Exp $
./dev/lms0 base-obsolete obsolete
./dev/mms0 base-obsolete obsolete
./lib/i386 base-compat-shlib compat
@@ -86,7 +86,7 @@
./usr/lib/i386/libc++.so.1 base-compat-shlib compat,pic,libcxx
./usr/lib/i386/libc++.so.1.0 base-compat-shlib compat,pic,libcxx
./usr/lib/i386/libc.so.12 base-compat-shlib compat,pic
-./usr/lib/i386/libc.so.12.193 base-compat-shlib compat,pic
+./usr/lib/i386/libc.so.12.194 base-compat-shlib compat,pic
./usr/lib/i386/libcom_err.so.7 base-compat-shlib compat,pic,kerberos
./usr/lib/i386/libcom_err.so.7.0 base-compat-shlib compat,pic,kerberos
./usr/lib/i386/libcrypt.so.1 base-compat-shlib compat,pic
Index: src/distrib/sets/lists/base/md.sparc64
diff -u src/distrib/sets/lists/base/md.sparc64:1.233 src/distrib/sets/lists/base/md.sparc64:1.234
--- src/distrib/sets/lists/base/md.sparc64:1.233 Fri Aug 22 06:51:38 2014
+++ src/distrib/sets/lists/base/md.sparc64 Wed Sep 24 14:16:37 2014
@@ -1,4 +1,4 @@
-# $NetBSD: md.sparc64,v 1.233 2014/08/22 10:51:38 apb Exp $
+# $NetBSD: md.sparc64,v 1.234 2014/09/24 18:16:37 christos Exp $
./lib/sparc base-npf-shlib compat
./lib/sparc/npf base-npf-shlib compat
./lib/sparc/npf/ext_log.so base-npf-shlib compat,pic
@@ -84,7 +84,7 @@
./usr/lib/sparc/libc++.so.1 base-compat-shlib compat,pic,libcxx
./usr/lib/sparc/libc++.so.1.0 base-compat-shlib compat,pic,libcxx
./usr/lib/sparc/libc.so.12 base-compat-shlib compat,pic
-./usr/lib/sparc/libc.so.12.193 base-compat-shlib compat,pic
+./usr/lib/sparc/libc.so.12.194 base-compat-shlib compat,pic
./usr/lib/sparc/libcom_err.so.7 base-compat-shlib compat,pic,kerberos
./usr/lib/sparc/libcom_err.so.7.0 base-compat-shlib compat,pic,kerberos
./usr/lib/sparc/libcrypt.so.1 base-compat-shlib compat,pic
Index: src/distrib/sets/lists/base/shl.mi
diff -u src/distrib/sets/lists/base/shl.mi:1.714 src/distrib/sets/lists/base/shl.mi:1.715
--- src/distrib/sets/lists/base/shl.mi:1.714 Mon Aug 25 14:44:02 2014
+++ src/distrib/sets/lists/base/shl.mi Wed Sep 24 14:16:37 2014
@@ -1,4 +1,4 @@
-# $NetBSD: shl.mi,v 1.714 2014/08/25 18:44:02 pooka Exp $
+# $NetBSD: shl.mi,v 1.715 2014/09/24 18:16:37 christos Exp $
#
# Note: Don't delete entries from here - mark them as "obsolete" instead,
# unless otherwise stated below.
@@ -15,7 +15,7 @@
#
./lib/libc.so base-sys-shlib dynamicroot
./lib/libc.so.12 base-sys-shlib dynamicroot
-./lib/libc.so.12.193 base-sys-shlib dynamicroot
+./lib/libc.so.12.194 base-sys-shlib dynamicroot
./lib/libcrypt.so base-sys-shlib dynamicroot
./lib/libcrypt.so.1 base-sys-shlib dynamicroot
./lib/libcrypt.so.1.0 base-sys-shlib dynamicroot
@@ -197,7 +197,7 @@
./usr/lib/libc++.so.1.0 base-sys-shlib libcxx
./usr/lib/libc.so base-sys-shlib
./usr/lib/libc.so.12 base-sys-shlib
-./usr/lib/libc.so.12.193 base-sys-shlib
+./usr/lib/libc.so.12.194 base-sys-shlib
./usr/lib/libcdk.so base-obsolete obsolete
./usr/lib/libcom_err.so base-krb5-shlib kerberos
./usr/lib/libcom_err.so.7 base-krb5-shlib kerberos
Index: src/distrib/sets/lists/comp/mi
diff -u src/distrib/sets/lists/comp/mi:1.1912 src/distrib/sets/lists/comp/mi:1.1913
--- src/distrib/sets/lists/comp/mi:1.1912 Tue Sep 23 11:05:25 2014
+++ src/distrib/sets/lists/comp/mi Wed Sep 24 14:16:37 2014
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.1912 2014/09/23 15:05:25 njoly Exp $
+# $NetBSD: mi,v 1.1913 2014/09/24 18:16:37 christos Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
#
@@ -9147,6 +9147,7 @@
./usr/share/man/cat3/strncpy.0 comp-c-catman .cat
./usr/share/man/cat3/strndup.0 comp-c-catman .cat
./usr/share/man/cat3/strnlen.0 comp-c-catman .cat
+./usr/share/man/cat3/strnstr.0 comp-c-catman .cat
./usr/share/man/cat3/strnunvis.0 comp-c-catman .cat
./usr/share/man/cat3/strnunvisx.0 comp-c-catman .cat
./usr/share/man/cat3/strnvis.0 comp-c-catman .cat
@@ -15916,6 +15917,7 @@
./usr/share/man/html3/strncpy.html comp-c-htmlman html
./usr/share/man/html3/strndup.html comp-c-htmlman html
./usr/share/man/html3/strnlen.html comp-c-htmlman html
+./usr/share/man/html3/strnstr.html comp-c-htmlman html
./usr/share/man/html3/strnunvis.html comp-c-htmlman html
./usr/share/man/html3/strnunvisx.html comp-c-htmlman html
./usr/share/man/html3/strnvis.html comp-c-htmlman html
@@ -22721,6 +22723,7 @@
./usr/share/man/man3/strncpy.3 comp-c-man .man
./usr/share/man/man3/strndup.3 comp-c-man .man
./usr/share/man/man3/strnlen.3 comp-c-man .man
+./usr/share/man/man3/strnstr.3 comp-c-man .man
./usr/share/man/man3/strnunvis.3 comp-c-man .man
./usr/share/man/man3/strnunvisx.3 comp-c-man .man
./usr/share/man/man3/strnvis.3 comp-c-man .man
Index: src/distrib/sets/lists/debug/ad.aarch64
diff -u src/distrib/sets/lists/debug/ad.aarch64:1.4 src/distrib/sets/lists/debug/ad.aarch64:1.5
--- src/distrib/sets/lists/debug/ad.aarch64:1.4 Wed Sep 10 18:50:25 2014
+++ src/distrib/sets/lists/debug/ad.aarch64 Wed Sep 24 14:16:37 2014
@@ -1,4 +1,4 @@
-# $NetBSD: ad.aarch64,v 1.4 2014/09/10 22:50:25 matt Exp $
+# $NetBSD: ad.aarch64,v 1.5 2014/09/24 18:16:37 christos Exp $
-./usr/libdata/debug/usr/tests/lib/libc/gen/t_fpsetmask.debug
-./usr/libdata/debug/usr/tests/lib/libc/gen/t_fpsetround.debug
./usr/lib/eabi/libcrypto_g.a comp-c-debuglib compat,crypto,debuglib
@@ -67,7 +67,7 @@
./usr/libdata/debug/usr/lib/eabi/libbsdmalloc.so.0.0.debug comp-sys-debug debug,compat
./usr/libdata/debug/usr/lib/eabi/libbz2.so.1.1.debug comp-sys-debug debug,compat
./usr/libdata/debug/usr/lib/eabi/libc++.so.1.0.debug comp-sys-debug debug,compat,libcxx
-./usr/libdata/debug/usr/lib/eabi/libc.so.12.193.debug comp-sys-debug debug,compat
+./usr/libdata/debug/usr/lib/eabi/libc.so.12.194.debug comp-sys-debug debug,compat
./usr/libdata/debug/usr/lib/eabi/libcom_err.so.7.0.debug comp-compat-shlib compat,pic,kerberos,debug
./usr/libdata/debug/usr/lib/eabi/libcrypt.so.1.0.debug comp-sys-debug debug,compat
./usr/libdata/debug/usr/lib/eabi/libcrypto.so.8.3.debug comp-crypto-debug crypto,debug,compat
@@ -219,7 +219,7 @@
./usr/libdata/debug/usr/lib/eabihf/libbsdmalloc.so.0.0.debug comp-sys-debug debug,compat
./usr/libdata/debug/usr/lib/eabihf/libbz2.so.1.1.debug comp-sys-debug debug,compat
./usr/libdata/debug/usr/lib/eabihf/libc++.so.1.0.debug comp-sys-debug debug,compat,libcxx
-./usr/libdata/debug/usr/lib/eabihf/libc.so.12.193.debug comp-sys-debug debug,compat
+./usr/libdata/debug/usr/lib/eabihf/libc.so.12.194.debug comp-sys-debug debug,compat
./usr/libdata/debug/usr/lib/eabihf/libcom_err.so.7.0.debug comp-compat-shlib compat,pic,kerberos,debug
./usr/libdata/debug/usr/lib/eabihf/libcrypt.so.1.0.debug comp-sys-debug debug,compat
./usr/libdata/debug/usr/lib/eabihf/libcrypto.so.8.3.debug comp-crypto-debug crypto,debug,compat
@@ -371,7 +371,7 @@
./usr/libdata/debug/usr/lib/oabi/libbsdmalloc.so.0.0.debug comp-sys-debug debug,compat
./usr/libdata/debug/usr/lib/oabi/libbz2.so.1.1.debug comp-sys-debug debug,compat
./usr/libdata/debug/usr/lib/oabi/libc++.so.1.0.debug comp-sys-debug debug,compat,libcxx
-./usr/libdata/debug/usr/lib/oabi/libc.so.12.193.debug comp-sys-debug debug,compat
+./usr/libdata/debug/usr/lib/oabi/libc.so.12.194.debug comp-sys-debug debug,compat
./usr/libdata/debug/usr/lib/oabi/libcom_err.so.7.0.debug comp-compat-shlib compat,pic,kerberos,debug
./usr/libdata/debug/usr/lib/oabi/libcrypt.so.1.0.debug comp-sys-debug debug,compat
./usr/libdata/debug/usr/lib/oabi/libcrypto.so.8.3.debug comp-crypto-debug crypto,debug,compat
Index: src/distrib/sets/lists/debug/ad.arm
diff -u src/distrib/sets/lists/debug/ad.arm:1.43 src/distrib/sets/lists/debug/ad.arm:1.44
--- src/distrib/sets/lists/debug/ad.arm:1.43 Fri Aug 22 06:51:38 2014
+++ src/distrib/sets/lists/debug/ad.arm Wed Sep 24 14:16:37 2014
@@ -1,4 +1,4 @@
-# $NetBSD: ad.arm,v 1.43 2014/08/22 10:51:38 apb Exp $
+# $NetBSD: ad.arm,v 1.44 2014/09/24 18:16:37 christos Exp $
./usr/lib/libarm_g.a comp-c-debuglib debuglib
./usr/lib/libc_vfp_g.a comp-c-debuglib debuglib,softfloat
./usr/lib/libpmc_g.a comp-c-debuglib debuglib
@@ -65,7 +65,7 @@
./usr/libdata/debug/usr/lib/oabi/libbsdmalloc.so.0.0.debug comp-sys-debug debug,compat
./usr/libdata/debug/usr/lib/oabi/libbz2.so.1.1.debug comp-sys-debug debug,compat
./usr/libdata/debug/usr/lib/oabi/libc++.so.1.0.debug comp-sys-debug debug,compat,pic,libcxx
-./usr/libdata/debug/usr/lib/oabi/libc.so.12.193.debug comp-sys-debug debug,compat
+./usr/libdata/debug/usr/lib/oabi/libc.so.12.194.debug comp-sys-debug debug,compat
./usr/libdata/debug/usr/lib/oabi/libc_vfp.so.0.0.debug comp-sys-debug debug,compat,pic
./usr/libdata/debug/usr/lib/oabi/libcom_err.so.6.0.debug comp-compat-shlib compat,pic,kerberos,debug,obsolete
./usr/libdata/debug/usr/lib/oabi/libcom_err.so.7.0.debug comp-compat-shlib compat,pic,kerberos,debug
Index: src/distrib/sets/lists/debug/ad.mips
diff -u src/distrib/sets/lists/debug/ad.mips:1.39 src/distrib/sets/lists/debug/ad.mips:1.40
--- src/distrib/sets/lists/debug/ad.mips:1.39 Fri Aug 22 06:51:38 2014
+++ src/distrib/sets/lists/debug/ad.mips Wed Sep 24 14:16:37 2014
@@ -1,4 +1,4 @@
-# $NetBSD: ad.mips,v 1.39 2014/08/22 10:51:38 apb Exp $
+# $NetBSD: ad.mips,v 1.40 2014/09/24 18:16:37 christos Exp $
./usr/lib/64/libcrypto_g.a comp-c-debuglib compat,crypto,debuglib,arch64
./usr/lib/64/libcrypto_idea_g.a comp-obsolete obsolete
./usr/lib/64/libcrypto_mdc2_g.a comp-obsolete obsolete
@@ -71,7 +71,7 @@
./usr/libdata/debug/usr/lib/64/libbluetooth.so.4.2.debug comp-sys-debug debug,compat,arch64
./usr/libdata/debug/usr/lib/64/libbsdmalloc.so.0.0.debug comp-sys-debug debug,compat,arch64
./usr/libdata/debug/usr/lib/64/libbz2.so.1.1.debug comp-sys-debug debug,compat,arch64
-./usr/libdata/debug/usr/lib/64/libc.so.12.193.debug comp-sys-debug debug,compat,arch64
+./usr/libdata/debug/usr/lib/64/libc.so.12.194.debug comp-sys-debug debug,compat,arch64
./usr/libdata/debug/usr/lib/64/libcom_err.so.6.0.debug comp-compat-shlib compat,pic,kerberos,debug,obsolete,arch64
./usr/libdata/debug/usr/lib/64/libcom_err.so.7.0.debug comp-compat-shlib compat,pic,kerberos,debug,arch64
./usr/libdata/debug/usr/lib/64/libcrypt.so.1.0.debug comp-sys-debug debug,compat,arch64
@@ -249,7 +249,7 @@
./usr/libdata/debug/usr/lib/o32/libbluetooth.so.4.2.debug comp-sys-debug debug,compat,arch64
./usr/libdata/debug/usr/lib/o32/libbsdmalloc.so.0.0.debug comp-sys-debug debug,compat,arch64
./usr/libdata/debug/usr/lib/o32/libbz2.so.1.1.debug comp-sys-debug debug,compat,arch64
-./usr/libdata/debug/usr/lib/o32/libc.so.12.193.debug comp-sys-debug debug,compat,arch64
+./usr/libdata/debug/usr/lib/o32/libc.so.12.194.debug comp-sys-debug debug,compat,arch64
./usr/libdata/debug/usr/lib/o32/libcom_err.so.6.0.debug comp-compat-shlib compat,pic,kerberos,debug,obsolete,arch64
./usr/libdata/debug/usr/lib/o32/libcom_err.so.7.0.debug comp-compat-shlib compat,pic,kerberos,debug,arch64
./usr/libdata/debug/usr/lib/o32/libcrypt.so.1.0.debug comp-sys-debug debug,compat,arch64
Index: src/distrib/sets/lists/debug/ad.powerpc
diff -u src/distrib/sets/lists/debug/ad.powerpc:1.19 src/distrib/sets/lists/debug/ad.powerpc:1.20
--- src/distrib/sets/lists/debug/ad.powerpc:1.19 Fri Aug 22 06:51:38 2014
+++ src/distrib/sets/lists/debug/ad.powerpc Wed Sep 24 14:16:37 2014
@@ -1,4 +1,4 @@
-# $NetBSD: ad.powerpc,v 1.19 2014/08/22 10:51:38 apb Exp $
+# $NetBSD: ad.powerpc,v 1.20 2014/09/24 18:16:37 christos Exp $
./usr/lib/powerpc/libamu_g.a comp-c-debuglib compat,arch64,debuglib
./usr/lib/powerpc/libarchive_g.a comp-c-debuglib compat,arch64,debuglib
./usr/lib/powerpc/libasn1_g.a comp-c-debuglib compat,arch64,debuglib,kerberos
@@ -154,7 +154,7 @@
./usr/libdata/debug/usr/lib/powerpc/libbluetooth.so.4.2.debug comp-compat-shlib compat,arch64,debug,pic
./usr/libdata/debug/usr/lib/powerpc/libbsdmalloc.so.0.0.debug comp-compat-shlib compat,arch64,debug,pic
./usr/libdata/debug/usr/lib/powerpc/libbz2.so.1.1.debug comp-compat-shlib compat,arch64,debug,pic
-./usr/libdata/debug/usr/lib/powerpc/libc.so.12.193.debug comp-compat-shlib compat,arch64,debug,pic
+./usr/libdata/debug/usr/lib/powerpc/libc.so.12.194.debug comp-compat-shlib compat,arch64,debug,pic
./usr/libdata/debug/usr/lib/powerpc/libcom_err.so.7.0.debug comp-compat-shlib compat,arch64,debug,pic,kerberos
./usr/libdata/debug/usr/lib/powerpc/libcrypt.so.1.0.debug comp-compat-shlib compat,arch64,debug,pic
./usr/libdata/debug/usr/lib/powerpc/libcrypto.so.8.3.debug comp-compat-shlib compat,arch64,debug,pic,crypto
Index: src/distrib/sets/lists/debug/ad.riscv
diff -u src/distrib/sets/lists/debug/ad.riscv:1.1 src/distrib/sets/lists/debug/ad.riscv:1.2
--- src/distrib/sets/lists/debug/ad.riscv:1.1 Fri Sep 19 13:36:24 2014
+++ src/distrib/sets/lists/debug/ad.riscv Wed Sep 24 14:16:37 2014
@@ -1,4 +1,4 @@
-# $NetBSD: ad.riscv,v 1.1 2014/09/19 17:36:24 matt Exp $
+# $NetBSD: ad.riscv,v 1.2 2014/09/24 18:16:37 christos Exp $
./usr/lib/rv32/libcrypto_g.a comp-c-debuglib compat,crypto,debuglib,arch64
./usr/lib/rv32/libcrypto_rc5_g.a comp-c-debuglib compat,crypto,crypto_rc5,debuglib,arch64
./usr/lib/rv32/libdevmapper_g.a comp-c-debuglib compat,debuglib,lvm,arch64
@@ -47,7 +47,7 @@
./usr/libdata/debug/usr/lib/rv32/libbluetooth.so.4.2.debug comp-sys-debug debug,compat,arch64
./usr/libdata/debug/usr/lib/rv32/libbsdmalloc.so.0.0.debug comp-sys-debug debug,compat,arch64
./usr/libdata/debug/usr/lib/rv32/libbz2.so.1.1.debug comp-sys-debug debug,compat,arch64
-./usr/libdata/debug/usr/lib/rv32/libc.so.12.193.debug comp-sys-debug debug,compat,arch64
+./usr/libdata/debug/usr/lib/rv32/libc.so.12.194.debug comp-sys-debug debug,compat,arch64
./usr/libdata/debug/usr/lib/rv32/libcom_err.so.7.0.debug comp-compat-shlib compat,pic,kerberos,debug,arch64
./usr/libdata/debug/usr/lib/rv32/libcrypt.so.1.0.debug comp-sys-debug debug,compat,arch64
./usr/libdata/debug/usr/lib/rv32/libcrypto.so.8.3.debug comp-crypto-debug crypto,debug,compat,arch64
Index: src/distrib/sets/lists/debug/md.amd64
diff -u src/distrib/sets/lists/debug/md.amd64:1.63 src/distrib/sets/lists/debug/md.amd64:1.64
--- src/distrib/sets/lists/debug/md.amd64:1.63 Sun Aug 10 04:07:50 2014
+++ src/distrib/sets/lists/debug/md.amd64 Wed Sep 24 14:16:37 2014
@@ -1,4 +1,4 @@
-# $NetBSD: md.amd64,v 1.63 2014/08/10 08:07:50 spz Exp $
+# $NetBSD: md.amd64,v 1.64 2014/09/24 18:16:37 christos Exp $
./usr/lib/i386/i18n/libBIG5_g.a comp-c-debuglib compat,debuglib
./usr/lib/i386/i18n/libDECHanyu_g.a comp-c-debuglib compat,debuglib
./usr/lib/i386/i18n/libEUCTW_g.a comp-c-debuglib compat,debuglib
@@ -200,7 +200,7 @@
./usr/libdata/debug/usr/lib/i386/libbsdmalloc.so.0.0.debug comp-compat-shlib compat,pic,debug
./usr/libdata/debug/usr/lib/i386/libbz2.so.1.1.debug comp-compat-shlib compat,pic,debug
./usr/libdata/debug/usr/lib/i386/libc++.so.1.0.debug comp-compat-shlib compat,pic,debug,libcxx
-./usr/libdata/debug/usr/lib/i386/libc.so.12.193.debug comp-compat-shlib compat,pic,debug
+./usr/libdata/debug/usr/lib/i386/libc.so.12.194.debug comp-compat-shlib compat,pic,debug
./usr/libdata/debug/usr/lib/i386/libcom_err.so.6.0.debug comp-compat-shlib compat,pic,kerberos,debug,obsolete
./usr/libdata/debug/usr/lib/i386/libcom_err.so.7.0.debug comp-compat-shlib compat,pic,kerberos,debug
./usr/libdata/debug/usr/lib/i386/libcrypt.so.1.0.debug comp-compat-shlib compat,pic,debug
Index: src/distrib/sets/lists/debug/md.sparc64
diff -u src/distrib/sets/lists/debug/md.sparc64:1.62 src/distrib/sets/lists/debug/md.sparc64:1.63
--- src/distrib/sets/lists/debug/md.sparc64:1.62 Fri Aug 22 06:51:38 2014
+++ src/distrib/sets/lists/debug/md.sparc64 Wed Sep 24 14:16:37 2014
@@ -1,4 +1,4 @@
-# $NetBSD: md.sparc64,v 1.62 2014/08/22 10:51:38 apb Exp $
+# $NetBSD: md.sparc64,v 1.63 2014/09/24 18:16:37 christos Exp $
./usr/lib/sparc/i18n/libBIG5_g.a comp-obsolete obsolete
./usr/lib/sparc/i18n/libDECHanyu_g.a comp-obsolete obsolete
./usr/lib/sparc/i18n/libEUCTW_g.a comp-obsolete obsolete
@@ -197,7 +197,7 @@
./usr/libdata/debug/usr/lib/sparc/libbluetooth.so.4.2.debug comp-compat-shlib compat,pic,debug
./usr/libdata/debug/usr/lib/sparc/libbsdmalloc.so.0.0.debug comp-compat-shlib compat,pic,debug
./usr/libdata/debug/usr/lib/sparc/libbz2.so.1.1.debug comp-compat-shlib compat,pic,debug
-./usr/libdata/debug/usr/lib/sparc/libc.so.12.193.debug comp-compat-shlib compat,pic,debug
+./usr/libdata/debug/usr/lib/sparc/libc.so.12.194.debug comp-compat-shlib compat,pic,debug
./usr/libdata/debug/usr/lib/sparc/libcom_err.so.6.0.debug comp-compat-shlib compat,pic,kerberos,debug,obsolete
./usr/libdata/debug/usr/lib/sparc/libcom_err.so.7.0.debug comp-compat-shlib compat,pic,kerberos,debug
./usr/libdata/debug/usr/lib/sparc/libcrypt.so.1.0.debug comp-compat-shlib compat,pic,debug
Index: src/distrib/sets/lists/debug/shl.mi
diff -u src/distrib/sets/lists/debug/shl.mi:1.73 src/distrib/sets/lists/debug/shl.mi:1.74
--- src/distrib/sets/lists/debug/shl.mi:1.73 Mon Aug 25 16:40:52 2014
+++ src/distrib/sets/lists/debug/shl.mi Wed Sep 24 14:16:37 2014
@@ -1,5 +1,5 @@
-# $NetBSD: shl.mi,v 1.73 2014/08/25 20:40:52 joerg Exp $
-./usr/libdata/debug/lib/libc.so.12.193.debug comp-sys-debug debug
+# $NetBSD: shl.mi,v 1.74 2014/09/24 18:16:37 christos Exp $
+./usr/libdata/debug/lib/libc.so.12.194.debug comp-sys-debug debug
./usr/libdata/debug/lib/libcrypt.so.1.0.debug comp-sys-debug debug
./usr/libdata/debug/lib/libcrypto.so.8.3.debug comp-sys-debug debug
./usr/libdata/debug/lib/libdevmapper.so.1.0.debug comp-sys-debug debug
@@ -60,7 +60,7 @@
./usr/libdata/debug/usr/lib/libbsdmalloc.so.0.0.debug comp-sys-debug debug
./usr/libdata/debug/usr/lib/libbz2.so.1.1.debug comp-sys-debug debug
./usr/libdata/debug/usr/lib/libc++.so.1.0.debug comp-sys-debug debug,libcxx
-./usr/libdata/debug/usr/lib/libc.so.12.193.debug comp-sys-debug debug
+./usr/libdata/debug/usr/lib/libc.so.12.194.debug comp-sys-debug debug
./usr/libdata/debug/usr/lib/libcom_err.so.7.0.debug comp-krb5-debug kerberos,debug
./usr/libdata/debug/usr/lib/libcrypt.so.1.0.debug comp-sys-debug debug
./usr/libdata/debug/usr/lib/libcrypto.so.8.3.debug comp-crypto-debug crypto,debug
Index: src/include/string.h
diff -u src/include/string.h:1.48 src/include/string.h:1.49
--- src/include/string.h:1.48 Wed Aug 28 13:47:07 2013
+++ src/include/string.h Wed Sep 24 14:16:36 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: string.h,v 1.48 2013/08/28 17:47:07 riastradh Exp $ */
+/* $NetBSD: string.h,v 1.49 2014/09/24 18:16:36 christos Exp $ */
/*-
* Copyright (c) 1990, 1993
@@ -102,6 +102,7 @@ size_t strlcpy(char *, const char *, si
char *strsep(char **, const char *);
char *stresep(char **, const char *, int);
char *strndup(const char *, size_t);
+char *strnstr(const char *, const char *, size_t);
void *memrchr(const void *, int, size_t);
void *explicit_memset(void *, int, size_t);
int consttime_memequal(const void *, const void *, size_t);
Index: src/lib/libc/shlib_version
diff -u src/lib/libc/shlib_version:1.254 src/lib/libc/shlib_version:1.255
--- src/lib/libc/shlib_version:1.254 Fri Jul 25 04:31:06 2014
+++ src/lib/libc/shlib_version Wed Sep 24 14:16:37 2014
@@ -1,4 +1,4 @@
-# $NetBSD: shlib_version,v 1.254 2014/07/25 08:31:06 dholland Exp $
+# $NetBSD: shlib_version,v 1.255 2014/09/24 18:16:37 christos Exp $
# Remember to update distrib/sets/lists/base/shl.* when changing
#
# things we wish to do on next major version bump:
@@ -42,4 +42,4 @@
# - move gethostbyname to a compat library
# - remove arc4random(3) API
major=12
-minor=193
+minor=194
Index: src/lib/libc/string/Makefile.inc
diff -u src/lib/libc/string/Makefile.inc:1.79 src/lib/libc/string/Makefile.inc:1.80
--- src/lib/libc/string/Makefile.inc:1.79 Mon Aug 19 06:59:39 2013
+++ src/lib/libc/string/Makefile.inc Wed Sep 24 14:16:37 2014
@@ -1,5 +1,5 @@
# from: @(#)Makefile.inc 8.1 (Berkeley) 6/4/93
-# $NetBSD: Makefile.inc,v 1.79 2013/08/19 10:59:39 joerg Exp $
+# $NetBSD: Makefile.inc,v 1.80 2014/09/24 18:16:37 christos Exp $
# string sources
.PATH: ${ARCHDIR}/string ${.CURDIR}/string
@@ -18,7 +18,7 @@ SRCS+= bm.c stpcpy.c stpncpy.c \
SRCS+= bcmp.c bcopy.c bzero.c ffs.c memchr.c memcmp.c memset.c
SRCS+= strcat.c strcmp.c strcpy.c strcspn.c strlen.c
SRCS+= strncat.c strncmp.c strncpy.c strpbrk.c strsep.c
-SRCS+= strspn.c strstr.c swab.c
+SRCS+= strspn.c strstr.c swab.c strnstr.c
SRCS+= explicit_memset.c consttime_memequal.c
SRCS+= memccpy.c memcpy.c memmem.c memmove.c
@@ -58,6 +58,7 @@ MLINKS+=strcpy.3 strncpy.3 strcpy.3 stpc
MLINKS+=strlcpy.3 strlcat.3
MLINKS+=strlen.3 strnlen.3
MLINKS+=strstr.3 strcasestr.3
+MLINKS+=strstr.3 strnstr.3
MLINKS+=memchr.3 memrchr.3
MLINKS+=strtok.3 strtok_r.3
MLINKS+=strerror.3 strerror_r.3 strerror.3 perror.3 \
Index: src/lib/libc/string/strstr.3
diff -u src/lib/libc/string/strstr.3:1.10 src/lib/libc/string/strstr.3:1.11
--- src/lib/libc/string/strstr.3:1.10 Mon Oct 16 04:48:45 2006
+++ src/lib/libc/string/strstr.3 Wed Sep 24 14:16:37 2014
@@ -31,13 +31,13 @@
.\" SUCH DAMAGE.
.\"
.\" from: @(#)strstr.3 8.1 (Berkeley) 6/4/93
-.\" $NetBSD: strstr.3,v 1.10 2006/10/16 08:48:45 wiz Exp $
+.\" $NetBSD: strstr.3,v 1.11 2014/09/24 18:16:37 christos Exp $
.\"
-.Dd July 3, 2004
+.Dd September 24, 2014
.Dt STRSTR 3
.Os
.Sh NAME
-.Nm strstr , strcasestr
+.Nm strstr , strcasestr , strnstr
.Nd locate a substring in a string
.Sh LIBRARY
.Lb libc
@@ -47,6 +47,8 @@
.Fn strstr "const char *big" "const char *little"
.Ft char *
.Fn strcasestr "const char *big" "const char *little"
+.Ft char *
+.Fn strnstr "const char *big" "const char *little" "size_t len"
.Sh DESCRIPTION
The
.Fn strstr
@@ -61,6 +63,24 @@ The
function is similar to
.Fn strstr ,
but ignores the case of both strings.
+The
+.Fn strnstr
+function
+locates the first occurrence of the null-terminated string
+.Fa little
+in the string
+.Fa big ,
+where not more than
+.Fa len
+characters are searched.
+Characters that appear after a
+.Ql \e0
+character are not searched.
+Since the
+.Fn strnstr
+function is a
+.Nx
+specific API, it should only be used when portability is not a concern.
.Sh RETURN VALUES
If
.Fa little
@@ -107,3 +127,8 @@ The
function
conforms to
.St -isoC .
+.Sh HISTORY
+The
+.Fn strnstr
+function originated in
+.Fx .
