Changeset 866

Timestamp:

Nov 22, 2003, 11:55:23 PM (22 years ago)

Author:

bird

Message:

Imported collate_range_cmp() and it's header.

File:

• trunk/src/emx/src/lib/bsd/gen/glob.c (modified) (5 diffs, 1 prop)

trunk/src/emx/src/lib/bsd/gen/glob.c

@@ -81 +81 @@
 #include <unistd.h>
 
-#ifndef __EMX__
 #include "collate.h"
-#endif
 
 #define DOLLAR          '$'
@@ -159 +157 @@
 
 int
-glob(pattern, flags, errfunc, pglob)
+_STD(glob)(pattern, flags, errfunc, pglob)
         const char *pattern;
         int flags, (*errfunc)(const char *, int);
@@ -381 +379 @@
                  */
                 if (
-#if !defined(__NETBSD_SYSCALLS) && !defined(__EMX__)
+#if !defined(__NETBSD_SYSCALLS)
                     issetugid() != 0 ||
 #endif
@@ -769 +767 @@
                         while (((c = *pat++) & M_MASK) != M_END)
                                 if ((*pat & M_MASK) == M_RNG) {
-#ifdef __EMX__ /** @todo __collate_range_cmp */
-                                        if (CHAR(c) <= CHAR(k) && CHAR(k) <= CHAR(pat[1]))
-
+#ifdef __EMX__ /* we don't include all the locale stuff, only standalone stuff like this. */
+                                        if (   __collate_range_cmp(CHAR(c), CHAR(k)) <= 0
+                                            && __collate_range_cmp(CHAR(k), CHAR(pat[1])) <= 0)
 #else
                                         if (__collate_load_error ?
@@ -797 +795 @@
 /* Free allocated data belonging to a glob_t structure. */
 void
-globfree(pglob)
+_STD(globfree)(pglob)
         glob_t *pglob;
 {