From b039b5642f4bdfb3579c8ecc934b04dc1d9af31f Mon Sep 17 00:00:00 2001
From: Klaas Freitag <freitag@owncloud.com>
Date: Thu, 4 Oct 2012 13:56:30 +0200
Subject: [PATCH] Copy csync.conf from ~/.csync/ if existing.

---
 src/csync_config.c | 50 +++++++++++++++++++++++++++++++++++++++++++---
 1 file changed, 47 insertions(+), 3 deletions(-)

diff --git a/src/csync_config.c b/src/csync_config.c
index 9dea67381..01fa5df79 100644
--- a/src/csync_config.c
+++ b/src/csync_config.c
@@ -20,12 +20,16 @@
 
 #include "config.h"
 
+#define _GNU_SOURCE
+#include <stdio.h>
+
 #include <iniparser.h>
 
 #include "c_lib.h"
 #include "c_private.h"
 #include "csync_private.h"
 #include "csync_config.h"
+#include "csync_misc.h"
 
 #define CSYNC_LOG_CATEGORY_NAME "csync.config"
 #include "csync_log.h"
@@ -73,9 +77,49 @@ int csync_config_load(CSYNC *ctx, const char *config) {
 
   /* copy default config, if no config exists */
   if (! c_isfile(config)) {
-    if (_csync_config_copy_default(config) < 0) {
-      return -1;
-    }
+      /* check if there is still one csync.conf left over in $HOME/.csync
+       * and copy it over (migration path)
+       */
+      char *home = NULL;
+      char *home_config = NULL;
+      char *config_file = NULL;
+
+      /* there is no statedb at the expected place. */
+      home = csync_get_user_home_dir();
+      if( !c_streq(home, ctx->options.config_dir) ) {
+          int rc = -1;
+
+          config_file = c_basename(config);
+          if( config_file ) {
+              rc = asprintf(&home_config, "%s/%s/%s", home, CSYNC_CONF_DIR, config_file);
+              SAFE_FREE(config_file);
+          }
+
+          if (rc >= 0) {
+              CSYNC_LOG(CSYNC_LOG_PRIORITY_NOTICE, "config file %s not found, checking %s",
+                        config, home_config);
+
+              /* check the home file and copy to new statedb if existing. */
+              if(c_isfile(home_config)) {
+                  if (c_copy(home_config, config, 0644) < 0) {
+                      /* copy failed, but that is not reason to die. */
+                      CSYNC_LOG(CSYNC_LOG_PRIORITY_WARN, "Could not copy config %s => %s",
+                                home_config, config);
+                  } else {
+                      CSYNC_LOG(CSYNC_LOG_PRIORITY_NOTICE, "Copied %s => %s",
+                                home_config, config);
+                  }
+              }
+          }
+          SAFE_FREE(home_config);
+      }
+      SAFE_FREE(home);
+      /* Still install the default one if nothing is there. */
+      if( ! c_isfile(config)) {
+          if (_csync_config_copy_default(config) < 0) {
+              return -1;
+          }
+      }
   }
 
   dict = iniparser_load(config);