Refactor headers

[wimlib] / src / unix_apply.c

diff --git a/src/unix_apply.c b/src/unix_apply.c
index 0b96055d8142afe916d35eb9eaab6cc75f2e615e..6b3ede19e82778658a1af73aa8e36eed1fb66362 100644 (file)
--- a/src/unix_apply.c
+++ b/src/unix_apply.c
@@ -21,11 +21,12 @@
  * along with wimlib; if not, see http://www.gnu.org/licenses/.
  */
 
  * along with wimlib; if not, see http://www.gnu.org/licenses/.
  */
 

-#include "config.h"
+#ifndef __WIN32__

 
 

-#ifdef HAVE_UTIME_H
-#  include <utime.h>
+#ifdef HAVE_CONFIG_H
+#  include "config.h"

 #endif
 #endif

+

 #include <dirent.h>
 #include <errno.h>
 #include <fcntl.h>
 #include <dirent.h>
 #include <errno.h>
 #include <fcntl.h>


@@ -33,10 +34,15 @@
 #include <sys/stat.h>
 #include <sys/time.h>
 #include <unistd.h>
 #include <sys/stat.h>
 #include <sys/time.h>
 #include <unistd.h>

+#ifdef HAVE_UTIME_H
+#  include <utime.h>
+#endif

 
 

-#include "timestamp.h"
-#include "wimlib_internal.h"
-#include "lookup_table.h"
+#include "wimlib/apply.h"
+#include "wimlib/error.h"
+#include "wimlib/lookup_table.h"
+#include "wimlib/reparse.h"
+#include "wimlib/timestamp.h"

 
 /* Returns the number of components of @path.  */
 static unsigned
 
 /* Returns the number of components of @path.  */
 static unsigned


@@ -383,8 +389,6 @@ unix_extract_directory(struct wim_dentry *dentry, const tchar *output_path,
        ret = tstat(output_path, &stbuf);
        if (ret == 0) {
                if (S_ISDIR(stbuf.st_mode)) {
        ret = tstat(output_path, &stbuf);
        if (ret == 0) {
                if (S_ISDIR(stbuf.st_mode)) {

-                       /*if (!is_root)*/
-                               /*WARNING("`%s' already exists", output_path);*/

                        goto dir_exists;
                } else {
                        ERROR("`%"TS"' is not a directory", output_path);
                        goto dir_exists;
                } else {
                        ERROR("`%"TS"' is not a directory", output_path);


@@ -493,3 +497,5 @@ unix_do_apply_dentry_timestamps(const char *output_path,
        }
        return 0;
 }
        }
        return 0;
 }

+
+#endif /* !__WIN32__ */