news

Author: arminbiere

NEWS.md

@@ -1,4 +1,16 @@
-Version 1.7.2
+Version 1.7.4
+-------------
+
+- As `fork` and `wait` do not exist on Windows writing compressed files
+  through `pipe/fork/exec/wait` has to be disabled for Windows cross
+  compilation to go through, which has the effect that compressed
+  file writing is not supported for Windows anymore.  Alternatively
+  one could go back to `popen` for writing compressed files on Windows
+  which however is not safe and therefore we simply decided to disable
+  that feature for windows.  Compressed file reading still (and as far
+  we now safely) uses `popen` and thus also compiles for Windows.
+
+Version 1.7.3
 -------------
 
 - Replaced the unsafe `popen` approach for compressed file writing

src/file.cpp

@@ -11,10 +11,17 @@ extern "C" {
 #include <string.h>
 #include <sys/stat.h>
 #include <sys/types.h>
-#include <sys/wait.h>
 #include <unistd.h>
 }
 
+#ifndef _WIN32
+
+extern "C" {
+#include <sys/wait.h>
+};
+
+#endif
+
 /*------------------------------------------------------------------------*/
 
 namespace CaDiCaL {
@@ -243,6 +250,8 @@ FILE *File::read_pipe (Internal *internal, const char *fmt, const int *sig,
   return open_pipe (internal, fmt, path, "r");
 }
 
+#ifndef _WIN32
+
 FILE *File::write_pipe (Internal *internal, const char *command,
                         const char *path, int &child_pid) {
   assert (command[0] && command[0] != ' ');
@@ -286,6 +295,8 @@ FILE *File::write_pipe (Internal *internal, const char *command,
   return res;
 }
 
+#endif
+
 /*------------------------------------------------------------------------*/
 
 File *File::read (Internal *internal, FILE *f, const char *n) {
@@ -334,6 +345,7 @@ File *File::read (Internal *internal, const char *path) {
 File *File::write (Internal *internal, const char *path) {
   FILE *file;
   int close_output = 3, child_pid = 0;
+#ifndef _WIN32
   if (has_suffix (path, ".xz"))
     file = write_pipe (internal, "xz -c", path, child_pid);
   else if (has_suffix (path, ".bz2"))
@@ -343,6 +355,7 @@ File *File::write (Internal *internal, const char *path) {
   else if (has_suffix (path, ".7z"))
     file = write_pipe (internal, "7z a -an -txz -si -so", path, child_pid);
   else
+#endif
     file = write_file (internal, path), close_output = 1;
 
   if (!file)
@@ -364,11 +377,13 @@ void File::close () {
     MSG ("closing input pipe to read '%s'", name ());
     pclose (file);
   }
+#ifndef _WIN32
   if (close_file == 3) {
     MSG ("closing output pipe to write '%s'", name ());
     fclose (file);
     waitpid (child_pid, 0, 0);
   }
+#endif
   file = 0; // mark as closed
 
   // TODO what about error checking for 'fclose', 'pclose' or 'waitpid'?

src/file.hpp

@@ -58,8 +58,10 @@ class File {
                           const char *mode);
   static FILE *read_pipe (Internal *, const char *fmt, const int *sig,
                           const char *path);
+#ifndef __WIN32
   static FILE *write_pipe (Internal *, const char *fmt, const char *path,
                            int &child_pid);
+#endif
 
 public:
   static char *find_program (const char *prg); // search in 'PATH'

src/mobical.cpp

@@ -2227,13 +2227,20 @@ void Mobical::print_statistics () {
 
 extern "C" {
 #include <fcntl.h>
-#include <sys/resource.h>
 #include <sys/stat.h>
 #include <sys/time.h>
 #include <sys/types.h>
-#include <sys/wait.h>
 }
 
+#ifndef _WIN32
+
+extern "C" {
+#include <sys/resource.h>
+#include <sys/wait.h>
+};
+
+#endif
+
 int64_t Trace::generated;
 int64_t Trace::executed;
 int64_t Trace::failed;