From 1890d8d6a5941127257717012752b788e83ede8f Mon Sep 17 00:00:00 2001
From: ache <ache@FreeBSD.org>
Date: Thu, 31 Oct 1996 04:55:47 +0000
Subject: [PATCH] Replace collate_range_cmp call with its code

---
 lib/libcompat/regexp/regexp.c | 19 ++++++++++++++++++-
 1 file changed, 18 insertions(+), 1 deletion(-)

diff --git a/lib/libcompat/regexp/regexp.c b/lib/libcompat/regexp/regexp.c
index 963d6abc1b49..a442b962cfd2 100644
--- a/lib/libcompat/regexp/regexp.c
+++ b/lib/libcompat/regexp/regexp.c
@@ -33,7 +33,6 @@
  * regular-expression syntax might require a total rethink.
  */
 #include <limits.h>
-#include <locale.h>
 #include <regexp.h>
 #include <stdio.h>
 #include <ctype.h>
@@ -182,10 +181,28 @@ STATIC void regc();
 STATIC void reginsert();
 STATIC void regtail();
 STATIC void regoptail();
+STATIC int  collate_range_cmp();
 #ifdef STRCSPN
 STATIC int strcspn();
 #endif
 
+static int collate_range_cmp (c1, c2)
+	int c1, c2;
+{
+	static char s1[2], s2[2];
+	int ret;
+
+	c1 &= UCHAR_MAX;
+	c2 &= UCHAR_MAX;
+	if (c1 == c2)
+		return (0);
+	s1[0] = c1;
+	s2[0] = c2;
+	if ((ret = strcoll(s1, s2)) != 0)
+		return (ret);
+	return (c1 - c2);
+}
+
 /*
  - regcomp - compile a regular expression into internal code
  *