Changeset 4832Tweet

Timestamp:

08/01/12 14:17:25 (11 months ago)

Author:

wisk

Message:

add regex feature for win32

Location:

zzuf/trunk

Files:

• msvc/config.h (modified) (1 diff)
• msvc/libzzuf.vcxproj (modified) (2 diffs)
• msvc/zzuf.vcxproj (modified) (2 diffs)
• src/com_regexp.cpp (added)
• src/com_regexp.hpp (added)
• src/common/fd.c (modified) (2 diffs)
• src/common/fd.h (modified) (1 diff)
• src/libzzuf/lib-win32.c (modified) (1 diff)
• src/myfork.c (modified) (1 diff)
• src/zzuf.c (modified) (1 diff)

zzuf/trunk/msvc/config.h

@@ -79 +79 @@
 /* #undef HAVE_RECVMSG */
 /* #undef HAVE_REGEX_H */
+#define HAVE_REGEX_H 1
 #define HAVE_REOPENFILE 1
 /* #undef HAVE_SETENV */

zzuf/trunk/msvc/libzzuf.vcxproj

@@ -110 +110 @@
     <ClInclude Include="..\src\common\random.h" />
     <ClInclude Include="..\src\common\ranges.h" />
+    <ClInclude Include="..\src\com_regexp.hpp" />
     <ClInclude Include="..\src\libzzuf\debug.h" />
     <ClInclude Include="..\src\libzzuf\lib-load.h" />
@@ -122 +123 @@
     <ClCompile Include="..\src\common\random.c" />
     <ClCompile Include="..\src\common\ranges.c" />
+    <ClCompile Include="..\src\com_regexp.cpp">
+      <CompileAs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">CompileAsCpp</CompileAs>
+      <CompileAs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">CompileAsCpp</CompileAs>
+    </ClCompile>
     <ClCompile Include="..\src\libzzuf\debug.c" />
     <ClCompile Include="..\src\libzzuf\lib-fd.c" />

zzuf/trunk/msvc/zzuf.vcxproj

@@ -99 +99 @@
     <ClInclude Include="..\src\common\random.h" />
     <ClInclude Include="..\src\common\ranges.h" />
+    <ClInclude Include="..\src\com_regexp.hpp" />
     <ClInclude Include="..\src\md5.h" />
     <ClInclude Include="..\src\myfork.h" />
@@ -110 +111 @@
     <ClCompile Include="..\src\common\random.c" />
     <ClCompile Include="..\src\common\ranges.c" />
+    <ClCompile Include="..\src\com_regexp.cpp">
+      <CompileAs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">CompileAsCpp</CompileAs>
+      <CompileAs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">CompileAsCpp</CompileAs>
+    </ClCompile>
     <ClCompile Include="..\src\md5.c" />
     <ClCompile Include="..\src\myfork.c" />

zzuf/trunk/src/common/fd.c

@@ -25 +25 @@
 #include <stdlib.h>
 #if defined HAVE_REGEX_H
-#   include <regex.h>
+#   if _WIN32
+#       include "../com_regexp.hpp"
+#   else
+#       include <regex.h>
+#   endif
 #endif
 #include <string.h>
@@ -201 +205 @@
 
     if(has_exclude && regexec(&re_exclude, file, 0, NULL, 0) != REG_NOMATCH)
+        return 0; /* excluded: ignore */
+#else
+    (void)file;
+#endif
+
+    return 1; /* default */
+}
+
+int _zz_mustwatchw(wchar_t const *file)
+{
+#if defined HAVE_REGEX_H
+    if(has_include && regwexec(&re_include, file, 0, NULL, 0) == REG_NOMATCH)
+        return 0; /* not included: ignore */
+
+    if(has_exclude && regwexec(&re_exclude, file, 0, NULL, 0) != REG_NOMATCH)
         return 0; /* excluded: ignore */
 #else

zzuf/trunk/src/common/fd.h

@@ -25 +25 @@
 
 extern int _zz_mustwatch(char const *);
+extern int _zz_mustwatchw(wchar_t const *);
 extern int _zz_iswatched(int);
 extern void _zz_register(int);

zzuf/trunk/src/libzzuf/lib-win32.c

@@ -106 +106 @@
 
     if(!_zz_ready || _zz_islocked(-1)) return ret;
-    if (ret != INVALID_HANDLE_VALUE && dwCreationDisposition == OPEN_EXISTING && _zz_mustwatch(lpFileName))
+    if (ret != INVALID_HANDLE_VALUE && dwCreationDisposition == OPEN_EXISTING && _zz_mustwatchw(lpFileName))
     {
         debug("handle %#08x is registered", ret);

zzuf/trunk/src/myfork.c

@@ -380 +380 @@
     /* insert your breakpoint here to have a chance to attach a debugger to libzzuf.dll */
     ret = ResumeThread(pinfo.hThread);
-    if(ret < 0)
+    if(ret == -1)
     {
         TerminateProcess(pinfo.hProcess, -1);

zzuf/trunk/src/zzuf.c

@@ -30 +30 @@
 #endif
 #if defined HAVE_REGEX_H
-#   include <regex.h>
+#   if _WIN32
+#       include "com_regexp.hpp"
+#   else
+#       include <regex.h>
+#   endif
 #endif
 #if defined HAVE_WINSOCK2_H