add ug.exe --filter support #442

Genivia · Nov 19, 2024 · d0ebf7f · d0ebf7f
1 parent d3e19f9
commit d0ebf7f
Show file tree

Hide file tree

Showing 8 changed files with 229 additions and 91 deletions.
diff --git a/bin/win32/ug.exe b/bin/win32/ug.exe
diff --git a/bin/win32/ugrep-indexer.exe b/bin/win32/ugrep-indexer.exe
diff --git a/bin/win32/ugrep.exe b/bin/win32/ugrep.exe
diff --git a/bin/win64/ug.exe b/bin/win64/ug.exe
diff --git a/bin/win64/ugrep-indexer.exe b/bin/win64/ugrep-indexer.exe
diff --git a/bin/win64/ugrep.exe b/bin/win64/ugrep.exe
diff --git a/src/ugrep.cpp b/src/ugrep.cpp
diff --git a/src/ugrep.hpp b/src/ugrep.hpp
@@ -38,7 +38,7 @@
 #define UGREP_HPP
 
 // DO NOT ALTER THIS LINE: updated by makemake.sh and we need it physically here for MSVC++ build from source
-#define UGREP_VERSION "7.0.4"
+#define UGREP_VERSION "7.1.0"
 
 // disable mmap because mmap is almost always slower than the file reading speed improvements since 3.0.0
 #define WITH_NO_MMAP
@@ -104,6 +104,30 @@ inline int pipe(int fd[2])
     fd[1] = _open_osfhandle(reinterpret_cast<intptr_t>(pipe_w), _O_WRONLY);
     return 0;
   }
+  errno = GetLastError();
+  return -1;
+}
+
+// POSIX pipe() emulation with inherited pipe handles for child processes (Windows specific)
+inline int pipe_inherit(int fd[2])
+{
+  HANDLE pipe_r = NULL;
+  HANDLE pipe_w = NULL;
+  SECURITY_ATTRIBUTES sa;
+  memset(&sa, 0, sizeof(SECURITY_ATTRIBUTES));
+  sa.nLength = sizeof(SECURITY_ATTRIBUTES); 
+  sa.bInheritHandle = TRUE; 
+  sa.lpSecurityDescriptor = NULL; 
+  if (CreatePipe(&pipe_r, &pipe_w, &sa, 0))
+  {
+    fd[0] = _open_osfhandle(reinterpret_cast<intptr_t>(pipe_r), _O_RDONLY);
+    fd[1] = _open_osfhandle(reinterpret_cast<intptr_t>(pipe_w), _O_WRONLY);
+    if (SetHandleInformation(reinterpret_cast<HANDLE>(_get_osfhandle(fd[0])), HANDLE_FLAG_INHERIT, 0))
+      return 0;
+    close(fd[0]);
+    close(fd[1]);
+  }
+  errno = GetLastError();
   return -1;
 }
 
@@ -166,6 +190,8 @@ inline int chdir(const char *path)
 inline char *getcwd0()
 {
   wchar_t *wcwd = _wgetcwd(NULL, 0);
+  if (wcwd == NULL)
+    return NULL;
   std::string cwd(utf8_encode(wcwd));
   free(wcwd);
   return strdup(cwd.c_str());