From 6d94ef8ead371a423211a68e249fa415d40f7278 Mon Sep 17 00:00:00 2001
From: Christoph Hellwig <hch@cloudius-systems.com>
Date: Thu, 10 Jan 2013 18:00:08 +0100
Subject: [PATCH] replace the strncmp implementation with a correct one from
OpenBSD
Using the recently commited strncmp broke the VFS path lookup.
---
libc/build.mak | 1 +
libc/string.cc | 13 ------------
libc/string/strncmp.c | 48 +++++++++++++++++++++++++++++++++++++++++++
licenses/ucb.txt | 28 +++++++++++++++++++++++++
4 files changed, 77 insertions(+), 13 deletions(-)
create mode 100755 libc/string/strncmp.c
create mode 100644 licenses/ucb.txt
diff --git a/libc/build.mak b/libc/build.mak
index 5bcebbfb8..30eef3c0c 100644
--- a/libc/build.mak
+++ b/libc/build.mak
@@ -1,5 +1,6 @@
libc = string/strcmp.o
libc += string/strcpy.o
+libc += string/strncmp.o
libc += string.o
libc += printf.o
libc += pthread.o
diff --git a/libc/string.cc b/libc/string.cc
index e55fb5470..5e49200d2 100644
--- a/libc/string.cc
+++ b/libc/string.cc
@@ -57,16 +57,3 @@ char* strdup(const char *s)
auto p = static_cast<char*>(malloc(strlen(s)+1));
return strcpy(p, s);
}
-
-int strncmp(const char *s1, const char *s2, size_t n)
-{
- while (n && *s1 && *s2 && tolower(*s1) == tolower(*s2)) {
- ++s1;
- ++s2;
- --n;
- }
- if (n == 0) {
- return 0;
- }
- return int(tolower(*s2)) - int(tolower(*s1));
-}
diff --git a/libc/string/strncmp.c b/libc/string/strncmp.c
new file mode 100755
index 000000000..6281ace17
--- /dev/null
+++ b/libc/string/strncmp.c
@@ -0,0 +1,48 @@
+/*
+ * Copyright (c) 1989, 1993
+ * The Regents of the University of California. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the University nor the names of its contributors
+ * may be used to endorse or promote products derived from this software
+ * without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * 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.
+ */
+
+#include <sys/cdefs.h>
+#include <string.h>
+
+int
+strncmp(s1, s2, n)
+ const char *s1, *s2;
+ size_t n;
+{
+
+ if (n == 0)
+ return (0);
+ do {
+ if (*s1 != *s2++)
+ return (*(unsigned char *)s1 - *(unsigned char *)--s2);
+ if (*s1++ == 0)
+ break;
+ } while (--n != 0);
+ return (0);
+}
diff --git a/licenses/ucb.txt b/licenses/ucb.txt
new file mode 100644
index 000000000..d3e3021ce
--- /dev/null
+++ b/licenses/ucb.txt
@@ -0,0 +1,28 @@
+/*
+ * Copyright (c) 1989, 1993
+ * The Regents of the University of California. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the University nor the names of its contributors
+ * may be used to endorse or promote products derived from this software
+ * without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * 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.
+ */
--
GitLab