From 979f2190d005fb155e3341dcfa9c1e9185cd6ad5 Mon Sep 17 00:00:00 2001
From: Nedko Arnaudov <nedko@arnaudov.name>
Date: Sun, 19 Sep 2010 17:04:14 +0300
Subject: [PATCH] move dirhelpers to common/

---
 {daemon => common}/dirhelpers.c | 5 +++--
 {daemon => common}/dirhelpers.h | 2 +-
 daemon/log.c                    | 2 +-
 daemon/main.c                   | 2 +-
 daemon/room_save.c              | 2 +-
 daemon/studio.c                 | 2 +-
 wscript                         | 2 +-
 7 files changed, 9 insertions(+), 8 deletions(-)
 rename {daemon => common}/dirhelpers.c (94%)
 rename {daemon => common}/dirhelpers.h (95%)

diff --git a/daemon/dirhelpers.c b/common/dirhelpers.c
similarity index 94%
rename from daemon/dirhelpers.c
rename to common/dirhelpers.c
index b4e1612e..2e1a281c 100644
--- a/daemon/dirhelpers.c
+++ b/common/dirhelpers.c
@@ -2,7 +2,7 @@
 /*
  * LADI Session Handler (ladish)
  *
- * Copyright (C) 2009 Nedko Arnaudov <nedko@arnaudov.name>
+ * Copyright (C) 2009,2010 Nedko Arnaudov <nedko@arnaudov.name>
  *
  **************************************************************************
  * This file contains implementation of the directory helper functions
@@ -24,11 +24,12 @@
  * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "common.h"
+#include "../common.h"
 
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <unistd.h>
+#include <errno.h>
 
 bool
 ensure_dir_exist(
diff --git a/daemon/dirhelpers.h b/common/dirhelpers.h
similarity index 95%
rename from daemon/dirhelpers.h
rename to common/dirhelpers.h
index 1c1fed53..0b473383 100644
--- a/daemon/dirhelpers.h
+++ b/common/dirhelpers.h
@@ -2,7 +2,7 @@
 /*
  * LADI Session Handler (ladish)
  *
- * Copyright (C) 2009 Nedko Arnaudov <nedko@arnaudov.name>
+ * Copyright (C) 2009,2010 Nedko Arnaudov <nedko@arnaudov.name>
  *
  **************************************************************************
  * This file contains prototypes of the directory helper functions
diff --git a/daemon/log.c b/daemon/log.c
index 9a7a5f27..a8981aa0 100644
--- a/daemon/log.c
+++ b/daemon/log.c
@@ -33,7 +33,7 @@
 #include <sys/stat.h>
 
 #include "../catdup.h"
-#include "dirhelpers.h"
+#include "../common/dirhelpers.h"
 
 #define DEFAULT_XDG_LOG "/.log"
 #define LADISH_XDG_SUBDIR "/" BASE_NAME
diff --git a/daemon/main.c b/daemon/main.c
index 869e350a..d4ac95ae 100644
--- a/daemon/main.c
+++ b/daemon/main.c
@@ -40,7 +40,7 @@
 #include "studio.h"
 #include "../dbus_constants.h"
 #include "../catdup.h"
-#include "dirhelpers.h"
+#include "../common/dirhelpers.h"
 #include "../proxies/a2j_proxy.h"
 #include "../proxies/jmcore_proxy.h"
 #include "../proxies/notify_proxy.h"
diff --git a/daemon/room_save.c b/daemon/room_save.c
index bb48f8f4..edf77786 100644
--- a/daemon/room_save.c
+++ b/daemon/room_save.c
@@ -34,7 +34,7 @@
 #include "room_internal.h"
 #include "../catdup.h"
 #include "save.h"
-#include "dirhelpers.h"
+#include "../common/dirhelpers.h"
 
 #define PROJECT_HEADER_TEXT BASE_NAME " Project.\n"
 
diff --git a/daemon/studio.c b/daemon/studio.c
index 8424a5fb..54dab8ea 100644
--- a/daemon/studio.c
+++ b/daemon/studio.c
@@ -36,7 +36,7 @@
 #include "../dbus_constants.h"
 #include "control.h"
 #include "../catdup.h"
-#include "dirhelpers.h"
+#include "../common/dirhelpers.h"
 #include "graph_dict.h"
 #include "escape.h"
 #include "studio.h"
diff --git a/wscript b/wscript
index f43477bc..03f96292 100644
--- a/wscript
+++ b/wscript
@@ -249,7 +249,6 @@ def build(bld):
         'main.c',
         'loader.c',
         'log.c',
-        'dirhelpers.c',
         'sigsegv.c',
         'proctitle.c',
         'appdb.c',
@@ -311,6 +310,7 @@ def build(bld):
 
     for source in [
         'time.c',
+        'dirhelpers.c',
         ]:
         daemon.source.append(os.path.join("common", source))