Changeset 859 for trunk/src

Timestamp:

Nov 22, 2003, 10:37:55 PM (22 years ago)

Author:

bird

Message:

Initial port.

File:

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

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

@@ -66 +66 @@
  */
 
+#include "libc-alias.h"
+
 #include <sys/param.h>
 #include <sys/stat.h>
@@ -79 +81 @@
 #include <unistd.h>
 
+#ifndef __EMX__
 #include "collate.h"
+#endif
 
 #define DOLLAR          '$'
@@ -360 +364 @@
                 return pattern;
 
-        /* 
-         * Copy up to the end of the string or / 
+        /*
+         * Copy up to the end of the string or /
          */
         eb = &patbuf[patbuf_len - 1];
@@ -377 +381 @@
                  */
                 if (
-#ifndef __NETBSD_SYSCALLS
+#if !defined(__NETBSD_SYSCALLS) && !defined(__EMX__)
                     issetugid() != 0 ||
 #endif
@@ -765 +769 @@
                         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]))
+
+#else
                                         if (__collate_load_error ?
                                             CHAR(c) <= CHAR(k) && CHAR(k) <= CHAR(pat[1]) :
@@ -770 +778 @@
                                             && __collate_range_cmp(CHAR(k), CHAR(pat[1])) <= 0
                                            )
+#endif
                                                 ok = 1;
                                         pat += 2;