Changeset 3532 for trunk/src/grep/lib

Timestamp:

Dec 20, 2021, 11:51:05 PM (4 years ago)

Author:

bird

Message:

grep: Initial windows config and adjustments.

Location:

trunk/src/grep/lib

Files:

• binary-io.h (modified) (1 diff)
• dfa.c (modified) (1 diff)
• dup-safer-flag.c (modified) (1 diff)
• dup-safer.c (modified) (1 diff)
• fnmatch.in.h (modified) (1 diff)
• getprogname-w32.c (added)
• regcomp.c (modified) (2 diffs)
• regex_internal.h (modified) (1 diff)
• w32-initialize-main.c (added)

trunk/src/grep/lib/binary-io.h

@@ -39 +39 @@
 #  define __gl_setmode setmode
 # else
+#  ifdef KMK_GREP
+#   include <io.h> /* declares _setmode() */
+#  endif
 #  define __gl_setmode _setmode
 #  undef fileno

trunk/src/grep/lib/dfa.c

@@ -297 +297 @@
   RPAREN,                       /* RPAREN never appears in the parse tree.  */
 
+#if defined(KMK_GREP) && defined(KBUILD_OS_WINDOWS)
+# define WCHAR DFA_WCHAR
+#endif
   WCHAR,                        /* Only returned by lex.  wctok contains
                                    the wide character representation.  */

trunk/src/grep/lib/dup-safer-flag.c

@@ -34 +34 @@
 dup_safer_flag (int fd, int flag)
 {
+#if defined(KMK_GREP) && defined(_MSC_VER)
+  int afd[STDERR_FILENO + 1];
+  int i;
+  for (i = 0; ; i++)
+    {
+      int fdNew = _dup(fd);
+      if (fdNew >= STDERR_FILENO + 1 || fdNew < 0)
+        {
+          while (i-- > 0)
+            close(afd[i]);
+          return fdNew;
+        }
+      afd[i] = fdNew;
+    }
+#else
   return fcntl (fd, (flag & O_CLOEXEC) ? F_DUPFD_CLOEXEC : F_DUPFD,
                 STDERR_FILENO + 1);
+#endif
 }

trunk/src/grep/lib/dup-safer.c

@@ -31 +31 @@
 dup_safer (int fd)
 {
+#if defined(KMK_GREP) && defined(_MSC_VER)
+  int afd[STDERR_FILENO + 1];
+  int i;
+  for (i = 0; ; i++)
+    {
+      int fdNew = _dup(fd);
+      if (fdNew >= STDERR_FILENO + 1 || fdNew < 0)
+        {
+          while (i-- > 0)
+            close(afd[i]);
+          return fdNew;
+        }
+      afd[i] = fdNew;
+    }
+#else
   return fcntl (fd, F_DUPFD, STDERR_FILENO + 1);
+#endif
 }

trunk/src/grep/lib/fnmatch.in.h

@@ -34 +34 @@
 
 /* The definitions of _GL_FUNCDECL_RPL etc. are copied here.  */
+#if defined(KMK_GREP)
+# include "c++defs.h"
+#endif
 
 /* The definition of _GL_ARG_NONNULL is copied here.  */
+#if defined(KMK_GREP)
+# include "arg-nonnull.h"
+#endif
 
 /* The definition of _GL_WARN_ON_USE is copied here.  */

trunk/src/grep/lib/regcomp.c

@@ -880 +880 @@
                        != 0);
 #else
+# ifdef _MSC_VER
+  (void)codeset_name;
+  if (GetACP() == 65001 /*utf-8*/)
+# else
   codeset_name = nl_langinfo (CODESET);
   if ((codeset_name[0] == 'U' || codeset_name[0] == 'u')
@@ -885 +889 @@
       && (codeset_name[2] == 'F' || codeset_name[2] == 'f')
       && strcmp (codeset_name + 3 + (codeset_name[3] == '-'), "8") == 0)
+# endif
     dfa->is_utf8 = 1;
 

trunk/src/grep/lib/regex_internal.h

@@ -26 +26 @@
 #include <string.h>
 
+#if !defined(KMK_GREP) || !defined(_MSC_VER)
 #include <langinfo.h>
+#endif
 #include <locale.h>
 #include <wchar.h>