Test suite without coreutils

[wimlib] / src / write.c

diff --git a/src/write.c b/src/write.c
index 773de0b7b6553e61ead5ef8b726e00f218b54f6a..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,17 +57,12 @@
 #include <ntfs-3g/dir.h>
 #endif
 
-
 #ifdef HAVE_ALLOCA_H
 #include <alloca.h>
 #else
 #include <stdlib.h>
 #endif
 
-#if defined(HAVE_SYS_FILE_H) && defined(HAVE_FLOCK)
-#include <sys/file.h>
-#endif
-
 
 static int do_fflush(FILE *fp)
 {
@@ -1492,6 +1496,29 @@ 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)
 {
@@ -1513,24 +1540,13 @@ static int open_wim_writable(WIMStruct *w, const char *path,
                ERROR_WITH_ERRNO("Failed to open `%s' for writing", path);
                return WIMLIB_ERR_OPEN;
        }
-#if defined(HAVE_SYS_FILE_H) && defined(HAVE_FLOCK)
-       if (!trunc) {
-               ret = flock(fileno(w->out_fp), LOCK_EX | LOCK_NB);
+       if (trunc) {
+               ret = lock_wim(w->out_fp, path);
                if (ret != 0) {
-                       if (errno == EWOULDBLOCK) {
-                               ERROR("`%s' is already being modified "
-                                     "by another process", path);
-                               ret = WIMLIB_ERR_ALREADY_LOCKED;
-                               fclose(w->out_fp);
-                               w->out_fp = NULL;
-                       } else {
-                               WARNING("Failed to lock `%s': %s",
-                                       path, strerror(errno));
-                               ret = 0;
-                       }
+                       fclose(w->out_fp);
+                       w->out_fp = NULL;
                }
        }
-#endif
        return ret;
 }