safe option

Author: Armin Biere

NEWS.md

@@ -1,3 +1,9 @@
+Version 1.7.2
+-------------
+
+- Configuration option `--safe` disables writing to a file
+  through `popen` which makes library usage safer.
+
 Version 1.7.1
 -------------
 
@@ -8,7 +14,7 @@ Version 1.7.1
    (worked for user propagator but now also in combination with LRAT);
    further minor bug fixes.
 
- - Added support for LRAT + external propagator in combination
+ - Added support for LRAT + external propagator in combination.
 
 Version 1.7.0
 -------------

VERSION

@@ -1 +1 @@
-1.7.1
+1.7.2

configure

@@ -22,6 +22,7 @@ check=no
 competition=no
 coverage=no
 profile=no
+safe=no
 contracts=yes
 tracing=yes
 unlocked=yes
@@ -97,6 +98,9 @@ where '<option>' is one of the following
 --competition      configure for the competition
                    ('--quiet', '--no-contracts', '--no-tracing')
 
+--safe             disable writing through 'popen' for more
+                   safe usage of the library in applications
+
 -f...              pass '-f<option>[=<val>]' options to the makefile
 -m32               pass '-m32' to the compiler (compile for 32 bit)
 -ggdb3             pass '-ggdb3' to makefile (like '-s')
@@ -154,6 +158,8 @@ do
 
     --competition) competition=yes;;
 
+    --safe) safe=yes;;
+
     --no-unlocked) unlocked=no;;
 
     -m32) options="$options $1";m32=yes;;
@@ -290,6 +296,7 @@ fi
 
 [ $check = no ] && CXXFLAGS="$CXXFLAGS -DNDEBUG"
 [ $logging = yes ] && CXXFLAGS="$CXXFLAGS -DLOGGING"
+[ $safe = yes ] && CXXFLAGS="$CXXFLAGS -DSAFE"
 [ $quiet = yes ] && CXXFLAGS="$CXXFLAGS -DQUIET"
 [ $profile = yes ] && CXXFLAGS="$CXXFLAGS -pg"
 [ $coverage = yes ] && CXXFLAGS="$CXXFLAGS -ftest-coverage -fprofile-arcs"

src/file.cpp

@@ -217,12 +217,16 @@ FILE *File::read_pipe (Internal *internal, const char *fmt, const int *sig,
   return open_pipe (internal, fmt, path, "r");
 }
 
+#ifndef SAFE
+
 FILE *File::write_pipe (Internal *internal, const char *fmt,
                         const char *path) {
   MSG ("opening pipe to write '%s'", path);
   return open_pipe (internal, fmt, path, "w");
 }
 
+#endif
+
 /*------------------------------------------------------------------------*/
 
 File *File::read (Internal *internal, FILE *f, const char *n) {
@@ -268,6 +272,7 @@ File *File::read (Internal *internal, const char *path) {
 File *File::write (Internal *internal, const char *path) {
   FILE *file;
   int close_input = 2;
+#ifndef SAFE
   if (has_suffix (path, ".xz"))
     file = write_pipe (internal, "xz -c > %s", path);
   else if (has_suffix (path, ".bz2"))
@@ -278,6 +283,7 @@ File *File::write (Internal *internal, const char *path) {
     file = write_pipe (internal, "7z a -an -txz -si -so > %s 2>/dev/null",
                        path);
   else
+#endif
     file = write_file (internal, path), close_input = 1;
 
   return file ? new File (internal, true, close_input, file, path) : 0;

src/file.hpp

@@ -53,7 +53,9 @@ class File {
                           const char *mode);
   static FILE *read_pipe (Internal *, const char *fmt, const int *sig,
                           const char *path);
+#ifndef SAFE
   static FILE *write_pipe (Internal *, const char *fmt, const char *path);
+#endif
 
 public:
   static char *find (const char *prg);     // search in 'PATH'

src/version.cpp

@@ -24,7 +24,7 @@
 
 #ifdef NBUILD
 #ifndef VERSION
-#define VERSION "1.7.1"
+#define VERSION "1.7.2"
 #endif // VERSION
 #endif // NBUILD