diff options
| author | Dale Rahn <drahn@cvs.openbsd.org> | 2002-05-25 02:46:10 +0000 |
|---|---|---|
| committer | Dale Rahn <drahn@cvs.openbsd.org> | 2002-05-25 02:46:10 +0000 |
| commit | b7222f5e3c22d9abc11068538a143310028dfaf4 (patch) | |
| tree | 0665c06fe3a3b367b394d664e600290dbbef7c34 | |
| parent | 9ebd66ff51576a046007140b1858f618470d427c (diff) | |
use _dl_strncmp() not strncmp(), _dl version is already present and used.
| -rw-r--r-- | libexec/ld.so/Makefile | 4 | ||||
| -rw-r--r-- | libexec/ld.so/sod.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/libexec/ld.so/Makefile b/libexec/ld.so/Makefile index ad12c5dabf4..4f4a37bf7aa 100644 --- a/libexec/ld.so/Makefile +++ b/libexec/ld.so/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.13 2002/05/25 02:34:45 drahn Exp $ +# $OpenBSD: Makefile,v 1.14 2002/05/25 02:46:09 drahn Exp $ SUBDIR=ldconfig ldd VPATH=${.CURDIR}/../../lib/libc/string:${.CURDIR}/../../sys/lib/libsa @@ -6,7 +6,7 @@ VPATH=${.CURDIR}/../../lib/libc/string:${.CURDIR}/../../sys/lib/libsa NOMAN= SRCS= ldasm.S loader.c library.c resolve.c dlfcn.c dl_printf.c rtld_machine.c SRCS+= util.c -SRCS+= sod.c strncmp.c strsep.c strtol.c +SRCS+= sod.c strsep.c strtol.c PROG= ld.so MAN= ld.so.8 .if (${MACHINE_ARCH} == "sparc64") diff --git a/libexec/ld.so/sod.c b/libexec/ld.so/sod.c index 5eca2fa60ec..f41a61f79d3 100644 --- a/libexec/ld.so/sod.c +++ b/libexec/ld.so/sod.c @@ -1,4 +1,4 @@ -/* $OpenBSD: sod.c,v 1.11 2002/05/25 02:34:45 drahn Exp $ */ +/* $OpenBSD: sod.c,v 1.12 2002/05/25 02:46:09 drahn Exp $ */ /* * Copyright (c) 1993 Paul Kranenburg @@ -230,7 +230,7 @@ _dl_findhint(name, major, minor, prefered_path) if (bp->hi_major == major && (bp->hi_ndewey < 2 || bp->hi_minor >= minor)) { if (prefered_path == NULL || - strncmp(prefered_path, + _dl_strncmp(prefered_path, hstrtab + bp->hi_pathx, _dl_strlen(prefered_path)) == 0) return hstrtab + bp->hi_pathx; |