Changeset 3532 in kBuild

Timestamp:

Dec 20, 2021 10:51:05 PM (3 years ago)

Author:

bird

Message:

grep: Initial windows config and adjustments.

Location:

trunk/src/grep

Files:

• Makefile.kmk (added)
• config.win.h (copied) (copied from trunk/src/grep/config.hin ) (24 diffs)
• lib/binary-io.h (modified) (1 diff)
• lib/dfa.c (modified) (1 diff)
• lib/dup-safer-flag.c (modified) (1 diff)
• lib/dup-safer.c (modified) (1 diff)
• lib/fnmatch.in.h (modified) (1 diff)
• lib/getprogname-w32.c (added)
• lib/regcomp.c (modified) (2 diffs)
• lib/regex_internal.h (modified) (1 diff)
• lib/w32-initialize-main.c (added)
• src/grep.c (modified) (4 diffs)

trunk/src/grep/config.win.h

@@ -1 @@
-/* config.hin.  Generated from configure.ac by autoheader.  */
+/* config.hin.  Manually edited */
+#ifndef INCLUDED_CONFIG_WIN_H
+#define INCLUDED_CONFIG_WIN_H
+
+#if 1
+
+/* HACK ALERT! Make inlined CRT functions static to avoid getting duplicate
+   symbols errors for things like _vprintf_l.  */
+# define _CRT_STDIO_INLINE static __inline
+
+/* HACK ALERT! Ugly ugly hack for making __local_stdio_printf_options static
+   and not to cause stupid stupid duplicate symbols linker errors. */
+# include <corecrt.h>
+# undef _CRT_INLINE_PURE_SECURITYCRITICAL_ATTRIBUTE
+# define _CRT_INLINE_PURE_SECURITYCRITICAL_ATTRIBUTE static
+
+/* HACK ALERT! wchar.h requires __inline temporarily redefined to static _inline or
+   we'll end up with mbsinit wmemchr, wmemcmp, wmemcpy and friends as duplicates.  */
+# include <stdio.h>
+# include <conio.h>
+# include <string.h>
+# include <time.h>
+# include <sys/stat.h>
+# define __inline static _inline
+# include <wchar.h>
+# undef __inline
+
+#endif
 
 /* CPU and C ABI indicator */
@@ -174 +201 @@
    compilers. Use 'FLEXSIZEOF (struct s, d, N * sizeof (short))' to calculate
    the size in bytes of such a struct containing an N-element array. */
-#undef FLEXIBLE_ARRAY_MEMBER
+#define FLEXIBLE_ARRAY_MEMBER 1
 
 /* Define to 1 if fopen() fails to recognize a trailing slash. */
@@ -227 +254 @@
 /* Define to a C preprocessor expression that evaluates to 1 or 0, depending
    whether the gnulib module openat shall be considered present. */
-#undef GNULIB_OPENAT
+#define GNULIB_OPENAT 1
 
 /* Define to a C preprocessor expression that evaluates to 1 or 0, depending
    whether the gnulib module openat-safer shall be considered present. */
-#undef GNULIB_OPENAT_SAFER
+#define GNULIB_OPENAT_SAFER 1
 
 /* enable some gnulib portability checks */
@@ -274 +301 @@
 /* Define to a C preprocessor expression that evaluates to 1 or 0, depending
    whether the gnulib module strerror_r-posix shall be considered present. */
-#undef GNULIB_STRERROR_R_POSIX
+#define GNULIB_STRERROR_R_POSIX 0
 
 /* Define to 1 when the gnulib module accept should be tested. */
@@ -619 +646 @@
 /* Define to a C preprocessor expression that evaluates to 1 or 0, depending
    whether the gnulib module xalloc shall be considered present. */
-#undef GNULIB_XALLOC
+#define GNULIB_XALLOC 1
 
 /* Define to a C preprocessor expression that evaluates to 1 or 0, depending
    whether the gnulib module xalloc-die shall be considered present. */
-#undef GNULIB_XALLOC_DIE
+#define GNULIB_XALLOC_DIE 1
 
 /* We are building grep */
-#undef GREP
+#define GREP
 
 /* Define to 1 if you have 'alloca' after including <alloca.h>, a header that
@@ -659 +686 @@
 
 /* Define to 1 if you have the `closedir' function. */
-#undef HAVE_CLOSEDIR
+#define HAVE_CLOSEDIR 1
 
 /* Define to 1 if you have the <crtdefs.h> header file. */
@@ -690 +717 @@
 /* Define to 1 if you have the declaration of `fchdir', and to 0 if you don't.
    */
-#undef HAVE_DECL_FCHDIR
+#define HAVE_DECL_FCHDIR 0
 
 /* Define to 1 if you have the declaration of `fcloseall', and to 0 if you
@@ -742 +769 @@
 /* Define to 1 if you have the declaration of `getchar_unlocked', and to 0 if
    you don't. */
-#undef HAVE_DECL_GETCHAR_UNLOCKED
+#define HAVE_DECL_GETCHAR_UNLOCKED 0
 
 /* Define to 1 if you have the declaration of `getc_unlocked', and to 0 if you
    don't. */
-#undef HAVE_DECL_GETC_UNLOCKED
+#define HAVE_DECL_GETC_UNLOCKED 0
 
 /* Define to 1 if you have the declaration of `getdtablesize', and to 0 if you
@@ -758 +785 @@
 /* Define to 1 if you have the declaration of `isblank', and to 0 if you
    don't. */
-#undef HAVE_DECL_ISBLANK
+#define HAVE_DECL_ISBLANK 0
 
 /* Define to 1 if you have the declaration of `iswblank', and to 0 if you
    don't. */
-#undef HAVE_DECL_ISWBLANK
+#define HAVE_DECL_ISWBLANK 1
 
 /* Define to 1 if you have the declaration of `mbrlen', and to 0 if you don't.
    */
-#undef HAVE_DECL_MBRLEN
+#define HAVE_DECL_MBRLEN 1
 
 /* Define to 1 if you have the declaration of `mbrtowc', and to 0 if you
    don't. */
-#undef HAVE_DECL_MBRTOWC
+#define HAVE_DECL_MBRTOWC 1
 
 /* Define to 1 if you have the declaration of `mbsinit', and to 0 if you
    don't. */
-#undef HAVE_DECL_MBSINIT
+#define HAVE_DECL_MBSINIT 0
 
 /* Define to 1 if you have the declaration of `mbsrtowcs', and to 0 if you
    don't. */
-#undef HAVE_DECL_MBSRTOWCS
+#define HAVE_DECL_MBSRTOWCS 0
 
 /* Define to 1 if you have the declaration of `memrchr', and to 0 if you
    don't. */
-#undef HAVE_DECL_MEMRCHR
+#define HAVE_DECL_MEMRCHR 0
 
 /* Define to 1 if you have the declaration of `program_invocation_name', and
    to 0 if you don't. */
-#undef HAVE_DECL_PROGRAM_INVOCATION_NAME
+#define HAVE_DECL_PROGRAM_INVOCATION_NAME 0
 
 /* Define to 1 if you have the declaration of `program_invocation_short_name',
    and to 0 if you don't. */
-#undef HAVE_DECL_PROGRAM_INVOCATION_SHORT_NAME
+#define HAVE_DECL_PROGRAM_INVOCATION_SHORT_NAME 0
 
 /* Define to 1 if you have the declaration of `putchar_unlocked', and to 0 if
    you don't. */
-#undef HAVE_DECL_PUTCHAR_UNLOCKED
+#define HAVE_DECL_PUTCHAR_UNLOCKED 0
 
 /* Define to 1 if you have the declaration of `putc_unlocked', and to 0 if you
    don't. */
-#undef HAVE_DECL_PUTC_UNLOCKED
+#define HAVE_DECL_PUTC_UNLOCKED 0
 
 /* Define to 1 if you have the declaration of `setenv', and to 0 if you don't.
    */
-#undef HAVE_DECL_SETENV
+#define HAVE_DECL_SETENV 0
 
 /* Define to 1 if you have the declaration of `sleep', and to 0 if you don't.
    */
-#undef HAVE_DECL_SLEEP
+#define HAVE_DECL_SLEEP 0
 
 /* Define to 1 if you have the declaration of `snprintf', and to 0 if you
    don't. */
-#undef HAVE_DECL_SNPRINTF
+#define HAVE_DECL_SNPRINTF 1
 
 /* Define to 1 if you have the declaration of `strdup', and to 0 if you don't.
    */
-#undef HAVE_DECL_STRDUP
+#define HAVE_DECL_STRDUP 1
 
 /* Define to 1 if you have the declaration of `strerror_r', and to 0 if you
    don't. */
-#undef HAVE_DECL_STRERROR_R
+#define HAVE_DECL_STRERROR_R 1
 
 /* Define to 1 if you have the declaration of `strnlen', and to 0 if you
    don't. */
-#undef HAVE_DECL_STRNLEN
+#define HAVE_DECL_STRNLEN 1
 
 /* Define to 1 if you have the declaration of `strtoimax', and to 0 if you
    don't. */
-#undef HAVE_DECL_STRTOIMAX
+#define HAVE_DECL_STRTOIMAX 1
 
 /* Define to 1 if you have the declaration of `strtoll', and to 0 if you
    don't. */
-#undef HAVE_DECL_STRTOLL
+#define HAVE_DECL_STRTOLL 1
 
 /* Define to 1 if you have the declaration of `strtoull', and to 0 if you
    don't. */
-#undef HAVE_DECL_STRTOULL
+#define HAVE_DECL_STRTOULL 1
 
 /* Define to 1 if you have the declaration of `strtoumax', and to 0 if you
    don't. */
-#undef HAVE_DECL_STRTOUMAX
+#define HAVE_DECL_STRTOUMAX 1
 
 /* Define to 1 if you have the declaration of `towlower', and to 0 if you
    don't. */
-#undef HAVE_DECL_TOWLOWER
+#define HAVE_DECL_TOWLOWER 1
 
 /* Define to 1 if you have the declaration of `unsetenv', and to 0 if you
    don't. */
-#undef HAVE_DECL_UNSETENV
+#define HAVE_DECL_UNSETENV 0
 
 /* Define to 1 if you have the declaration of `wcrtomb', and to 0 if you
    don't. */
-#undef HAVE_DECL_WCRTOMB
+#define HAVE_DECL_WCRTOMB 0
 
 /* Define to 1 if you have the declaration of `wcsdup', and to 0 if you don't.
    */
-#undef HAVE_DECL_WCSDUP
+#define HAVE_DECL_WCSDUP 1
 
 /* Define to 1 if you have the declaration of `wctob', and to 0 if you don't.
    */
-#undef HAVE_DECL_WCTOB
+#define HAVE_DECL_WCTOB 1
 
 /* Define to 1 if you have the declaration of `wcwidth', and to 0 if you
    don't. */
-#undef HAVE_DECL_WCWIDTH
+#define HAVE_DECL_WCWIDTH 0
 
 /* Define to 1 if you have the declaration of `_putenv', and to 0 if you
    don't. */
-#undef HAVE_DECL__PUTENV
+#define HAVE_DECL__PUTENV 1
 
 /* Define to 1 if you have the declaration of `_snprintf', and to 0 if you
@@ -874 +901 @@
 /* Define to 1 if you have the declaration of `__argv', and to 0 if you don't.
    */
-#undef HAVE_DECL___ARGV
+#define HAVE_DECL___ARGV 1
 
 /* Define to 1 if you have the declaration of `__fpending', and to 0 if you
    don't. */
-#undef HAVE_DECL___FPENDING
+#define HAVE_DECL___FPENDING 0
 
 /* Define to 1 if you have the <dirent.h> header file, and it defines `DIR'.
@@ -946 +973 @@
 
 /* Define to 1 if you have the `getprogname' function. */
-#undef HAVE_GETPROGNAME
+#define HAVE_GETPROGNAME 1
+const char *getprogname(void);
 
 /* Define to 1 if you have the `getrlimit' function. */
@@ -1069 +1097 @@
 
 /* Define to 1 if you have the `mempcpy' function. */
-#undef HAVE_MEMPCPY
+#define HAVE_MEMPCPY 1
+
+#include <string.h>
+static _inline void *mempcpy(void *pvDst, const void *pvSrc, size_t cb)
+{
+    return (char *)memcpy(pvDst, pvSrc, cb) + cb;
+}
 
 /* Define to 1 if you have the `memrchr' function. */
 #undef HAVE_MEMRCHR
+void *memrchr(const void *, int, size_t);
 
 /* Define to 1 if you have the <minix/config.h> header file. */
@@ -1113 +1148 @@
 
 /* Define to 1 if you have the `openat' function. */
-#undef HAVE_OPENAT
+#define HAVE_OPENAT 1
 
 /* Define to 1 if you have the `opendir' function. */
-#undef HAVE_OPENDIR
+#define HAVE_OPENDIR 1
 
 /* Define to 1 if you have the <OS.h> header file. */
@@ -1156 +1191 @@
 
 /* Define to 1 if you have the `rawmemchr' function. */
-#undef HAVE_RAWMEMCHR
+#define HAVE_RAWMEMCHR 1
+
+
+#include <string.h>
+static _inline void *rawmemchr(const void *pv, int ch)
+{
+    return memchr(pv, ch, ~(size_t)0 / 4);
+}
 
 /* Define to 1 if you have the `readdir' function. */
-#undef HAVE_READDIR
+#define HAVE_READDIR 1
 
 /* Define to 1 if you have the `reallocarray' function. */
@@ -1183 +1225 @@
 
 /* Define to 1 if you have the `setlocale' function. */
-#undef HAVE_SETLOCALE
+#define HAVE_SETLOCALE 1
 
 /* Define to 1 if you have the `setrlimit' function. */
@@ -1253 +1295 @@
 
 /* Define to 1 if you have the `strerror_r' function. */
-#undef HAVE_STRERROR_R
+#define HAVE_STRERROR_R 1
+#include <string.h>
+static _inline int strerror_r(int iErr, char *pszDst, size_t cbDst)
+{
+    return strerror_s(pszDst, cbDst, iErr);
+}
 
 /* Define to 1 if you have the <strings.h> header file. */
@@ -1565 +1612 @@
 
 /* Name of package */
-#undef PACKAGE
+#define PACKAGE "kmk_grep"
 
 /* Define to the address where bug reports for this package should be sent. */
-#undef PACKAGE_BUGREPORT
+#define PACKAGE_BUGREPORT "[email protected]"
 
 /* Define to the full name of this package. */
-#undef PACKAGE_NAME
+#define PACKAGE_NAME "kmk_grep"
 
 /* String identifying the packager of this software */
@@ -1592 +1639 @@
 
 /* Define to the version of this package. */
-#undef PACKAGE_VERSION
+#define PACKAGE_VERSION "3.7"
 
 /* Define to the type that is the result of default argument promotions of
    type mode_t. */
-#undef PROMOTED_MODE_T
+#define PROMOTED_MODE_T uintptr_t
 
 /* Define if pthread_create is an inline function. */
@@ -1622 +1669 @@
 
 /* Define to 1 if gnulib's fchdir() replacement is used. */
-#undef REPLACE_FCHDIR
+#define REPLACE_FCHDIR 1
 
 /* Define to 1 if stat needs help when passed a file name with a trailing
@@ -1721 +1768 @@
 /* Enable GNU extensions on systems that have them.  */
 #ifndef _GNU_SOURCE
-# undef _GNU_SOURCE
+# define _GNU_SOURCE
 #endif
 /* Enable X/Open compliant socket functions that do not require linking
@@ -1802 +1849 @@
 
 /* Version number of package */
-#undef VERSION
+#define VERSION PACKAGE_VERSION
 
 /* Define to 1 if unsetenv returns void instead of int. */
@@ -2417 +2464 @@
    nothing if this is not supported.  Do not define if restrict is
    supported only directly.  */
-#undef restrict
+#define restrict
 /* Work around a bug in older versions of Sun C++, which did not
    #define __restrict__ or support _Restrict or __restrict__
@@ -2436 +2483 @@
 
 /* Define as a signed type of the same size as size_t. */
-#undef ssize_t
+#define ssize_t ptrdiff_t
 
 /* Define to 'struct sigaltstack' if that's the type of the argument to
@@ -2463 +2510 @@
 /* Define as a macro for copying va_list variables. */
 #undef va_copy
+
+typedef unsigned mode_t;
+
+/* Include windows.h here before DATADIR is defined, as it conflicts with objidl.h. */
+#include <windows.h>
+
+/* Hack! */
+#include <arg-nonnull.h>
+
+/* More hacks */
+#define _GL_ATTRIBUTE_FORMAT_PRINTF_STANDARD(a, b)
+
+/* S_ISXXX macros: */
+#include <sys/stat.h>
+#include <nt/ntstat.h>
+#ifndef S_ISCHR
+# define S_ISCHR(x) 0
+#endif
+#ifndef S_ISBLK
+# define S_ISBLK(x) 0
+#endif
+#ifndef S_ISSOCK
+# define S_ISSOCK(x) 0
+#endif
+#ifndef S_ISFIFO
+# define S_ISFIFO(x) 0
+#endif
+#ifndef S_TYPEISSHM
+# define S_TYPEISSHM(x) 0
+#endif
+#ifndef S_TYPEISTMO
+# define S_TYPEISTMO(x) 0
+#endif
+
+/* Missing these: */
+#define STDIN_FILENO 0
+#define STDOUT_FILENO 1
+#define STDERR_FILENO 2
+
+/* Missing open flags.*/
+#include <nt/ntopenat.h>
+#ifndef O_NOCTTY
+# define O_NOCTTY 0
+#endif
+#ifndef O_NOFOLLOW
+# define O_NOFOLLOW 0
+#endif
+#ifndef O_NOLINK
+# define O_NOLINK 0
+#endif
+#ifndef O_NOLINKS
+# define O_NOLINKS 0
+#endif
+#ifndef O_NOTRANS
+# define O_NOTRANS 0
+#endif
+#ifndef O_NONBLOCK
+# define O_NONBLOCK 0
+#endif
+#ifndef O_SEARCH
+# define O_SEARCH 0
+#endif
+#ifndef O_CLOEXEC
+# define O_CLOEXEC _O_NOINHERIT
+#endif
+
+/* Some prototypes of gnulib functions put here to avoid needing to mess with
+   stdlib.in.h, string.in.h and wchar.in.h since MSC has no include_next facility. */
+extern void *reallocarray(void *, size_t, size_t);
+extern int mbscasecmp(const char *, const char *);
+extern wchar_t *wmempcpy(wchar_t *, const wchar_t *, size_t);
+extern int wcwidth(wchar_t);
+
+#define strerror gl_strerror
+
+/* Override initialize_main to do wildcard expansion. */
+#define initialize_main w32_initialize_main
+
+#endif /* !INCLUDED_CONFIG_WIN_H */
+

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>

trunk/src/grep/src/grep.c

@@ -39 +39 @@
 #include "exitfail.h"
 #include "fcntl-safer.h"
+#if defined(KMK_GREP) && defined(KBUILD_OS_WINDOWS)
+# include "nt/fts-nt.h" /* Use NT optimized FTS implementation. */
+#else
 #include "fts_.h"
+#endif
 #include "getopt.h"
 #include "getprogname.h"
@@ -1691 +1695 @@
         {
           struct stat *st = ent->fts_statp;
+#if !defined(KMK_GREP) || !defined(_MSC_VER) /** @todo revisit this */
           struct stat st1;
           if (! st->st_mode)
@@ -1705 +1710 @@
               st = &st1;
             }
+#endif
           if (is_device_mode (st->st_mode))
             return true;
@@ -2069 +2075 @@
   execute_fp_t execute;
 } const matchers[] = {
-  { "grep", RE_SYNTAX_GREP, GEAcompile, EGexecute },
-  { "egrep", RE_SYNTAX_EGREP, GEAcompile, EGexecute },
-  { "fgrep", 0, Fcompile, Fexecute, },
-  { "awk", RE_SYNTAX_AWK, GEAcompile, EGexecute },
-  { "gawk", RE_SYNTAX_GNU_AWK, GEAcompile, EGexecute },
-  { "posixawk", RE_SYNTAX_POSIX_AWK, GEAcompile, EGexecute },
+  { "grep",     RE_SYNTAX_GREP,      (compile_fp_t)GEAcompile,  (execute_fp_t)EGexecute },
+  { "egrep",    RE_SYNTAX_EGREP,     (compile_fp_t)GEAcompile,  (execute_fp_t)EGexecute },
+  { "fgrep",    0,                   (compile_fp_t)Fcompile,    (execute_fp_t)Fexecute },
+  { "awk",      RE_SYNTAX_AWK,       (compile_fp_t)GEAcompile,  (execute_fp_t)EGexecute },
+  { "gawk",     RE_SYNTAX_GNU_AWK,   (compile_fp_t)GEAcompile,  (execute_fp_t)EGexecute },
+  { "posixawk", RE_SYNTAX_POSIX_AWK, (compile_fp_t)GEAcompile,  (execute_fp_t)EGexecute },
 #if HAVE_LIBPCRE
-  { "perl", 0, Pcompile, Pexecute, },
+  { "perl",     0,                   (compile_fp_t)Pcompile,    (execute_fp_t)Pexecute },
 #endif
 };