Date: Wed, 1 Mar 2017 02:07:51 +0000 (UTC) From: Warner Losh <imp@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r314448 - head/sys/libkern Message-ID: <201703010207.v2127pcv062832@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: imp Date: Wed Mar 1 02:07:51 2017 New Revision: 314448 URL: https://svnweb.freebsd.org/changeset/base/314448 Log: strstr.c was inadvertently blasted with a copy of isa_nmi.c. Revert and remove clause 3 while I'm here. Modified: head/sys/libkern/strstr.c Modified: head/sys/libkern/strstr.c ============================================================================== --- head/sys/libkern/strstr.c Wed Mar 1 01:45:52 2017 (r314447) +++ head/sys/libkern/strstr.c Wed Mar 1 02:07:51 2017 (r314448) @@ -1,9 +1,9 @@ /*- - * Copyright (c) 1991 The Regents of the University of California. - * All rights reserved. + * Copyright (c) 1990, 1993 + * The Regents of the University of California. All rights reserved. * * This code is derived from software contributed to Berkeley by - * William Jolitz. + * Chris Torek. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -28,42 +28,32 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. - * - * from: @(#)isa.c 7.2 (Berkeley) 5/13/91 */ #include <sys/cdefs.h> __FBSDID("$FreeBSD$"); -#include <sys/types.h> -#include <sys/syslog.h> -#include <sys/systm.h> - -#include <machine/md_var.h> - -#define NMI_PARITY 0x04 -#define NMI_EPARITY 0x02 +#include <sys/param.h> +#include <sys/libkern.h> /* - * Handle a NMI, possibly a machine check. - * return true to panic system, false to ignore. + * Find the first occurrence of find in s. */ -int -isa_nmi(int cd) +char * +strstr(const char *s, const char *find) { - int retval = 0; - int port = inb(0x33); + char c, sc; + size_t len; - log(LOG_CRIT, "NMI PC98 port = %x\n", port); - if (port & NMI_PARITY) { - log(LOG_CRIT, "BASE RAM parity error, likely hardware failure."); - retval = 1; - } else if (port & NMI_EPARITY) { - log(LOG_CRIT, "EXTENDED RAM parity error, likely hardware failure."); - retval = 1; - } else { - log(LOG_CRIT, "\nNMI Resume ??\n"); + if ((c = *find++) != 0) { + len = strlen(find); + do { + do { + if ((sc = *s++) == 0) + return (NULL); + } while (sc != c); + } while (strncmp(s, find, len) != 0); + s--; } - - return(retval); + return (__DECONST(char *, s)); }
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201703010207.v2127pcv062832>