Fix conflict with LIST_HEAD in BSD

[wimlib] / src / write.c

diff --git a/src/write.c b/src/write.c
index b143f16d7dc4de001a0e3e2b2cd01b248ffcd593..29a8f21f0acc5be377f0c8b72bf4736a82c604b0 100644 (file)
--- a/src/write.c
+++ b/src/write.c
@@ -25,6 +25,15 @@
  * along with wimlib; if not, see http://www.gnu.org/licenses/.
  */
 
+#include "config.h"
+
+#if defined(HAVE_SYS_FILE_H) && defined(HAVE_FLOCK)
+/* On BSD, this should be included before "list.h" so that "list.h" can
+ * overwrite the LIST_HEAD macro. */
+#include <sys/file.h>
+#endif
+
+#include "list.h"
 #include "wimlib_internal.h"
 #include "io.h"
 #include "dentry.h"
@@ -32,13 +41,13 @@
 #include "xml.h"
 #include "lzx.h"
 #include "xpress.h"
-#include <unistd.h>
 
 #ifdef ENABLE_MULTITHREADED_COMPRESSION
 #include <semaphore.h>
 #include <pthread.h>
 #endif
 
+#include <unistd.h>
 #include <errno.h>
 
 #ifdef WITH_NTFS_3G
@@ -48,13 +57,13 @@
 #include <ntfs-3g/dir.h>
 #endif
 
-
 #ifdef HAVE_ALLOCA_H
 #include <alloca.h>
 #else
 #include <stdlib.h>
 #endif
 
+
 static int do_fflush(FILE *fp)
 {
        int ret = fflush(fp);
@@ -1487,6 +1496,61 @@ out:
        return ret;
 }
 
+#if defined(HAVE_SYS_FILE_H) && defined(HAVE_FLOCK)
+int lock_wim(FILE *fp, const char *path)
+{
+       int ret = 0;
+       if (fp) {
+               ret = flock(fileno(fp), LOCK_EX | LOCK_NB);
+               if (ret != 0) {
+                       if (errno == EWOULDBLOCK) {
+                               ERROR("`%s' is already being modified or has been "
+                                     "mounted read-write\n"
+                                     "        by another process!", path);
+                               ret = WIMLIB_ERR_ALREADY_LOCKED;
+                       } else {
+                               WARNING("Failed to lock `%s': %s",
+                                       path, strerror(errno));
+                               ret = 0;
+                       }
+               }
+       }
+       return ret;
+}
+#endif
+
+static int open_wim_writable(WIMStruct *w, const char *path,
+                            bool trunc, bool readable)
+{
+       const char *mode;
+       int ret = 0;
+       if (trunc)
+               if (readable)
+                       mode = "w+b";
+               else
+                       mode = "wb";
+       else
+               mode = "r+b";
+
+       DEBUG("Opening `%s' read-write", path);
+       wimlib_assert(w->out_fp == NULL);
+       wimlib_assert(path != NULL);
+       w->out_fp = fopen(path, mode);
+       if (!w->out_fp) {
+               ERROR_WITH_ERRNO("Failed to open `%s' for writing", path);
+               return WIMLIB_ERR_OPEN;
+       }
+       if (trunc) {
+               ret = lock_wim(w->out_fp, path);
+               if (ret != 0) {
+                       fclose(w->out_fp);
+                       w->out_fp = NULL;
+               }
+       }
+       return ret;
+}
+
+
 static void close_wim_writable(WIMStruct *w)
 {
        if (w->out_fp) {