From 64a8a911d3e43ddc8d928cbbed255d5ea72177b2 Mon Sep 17 00:00:00 2001
From: Andreas Schneider <mail@cynapses.org>
Date: Tue, 27 May 2008 14:11:46 +0200
Subject: [PATCH] Remove the backup mode bug add a mode to remove the journal.

---
 client/csync_client.c | 47 +++++++++++++++++--------------------------
 src/csync.c           | 13 ++++++++++--
 src/csync.h           |  1 +
 3 files changed, 30 insertions(+), 31 deletions(-)

diff --git a/client/csync_client.c b/client/csync_client.c
index 368eacbec7..bf8d1a82c3 100644
--- a/client/csync_client.c
+++ b/client/csync_client.c
@@ -31,7 +31,8 @@
 
 enum {
   KEY_DUMMY = 129,
-  KEY_EXCLUDE_FILE
+  KEY_EXCLUDE_FILE,
+  KEY_REMOVE_JOURNAL,
 };
 
 const char *argp_program_version = "csync commandline client 0.42";
@@ -46,13 +47,11 @@ static char args_doc[] = "SOURCE DESTINATION";
 /* The options we understand. */
 static struct argp_option options[] = {
   {
-    .name  = "backup",
-    .key   = 'b',
+    .name  = "remove-journal",
+    .key   = KEY_REMOVE_JOURNAL,
     .arg   = NULL,
     .flags = 0,
-    .doc   = "Run csync in backup mode. This is a special mode without a "
-             "journal and a temoporary configuration to sync two replicas. "
-             "This is the non-roaming-home-directory mode.",
+    .doc   = "Remove the journal after synchronization.",
     .group = 0
   },
   {
@@ -94,8 +93,8 @@ static struct argp_option options[] = {
 struct argument_s {
   char *args[2]; /* SOURCE and DESTINATION */
   char *exclude_file;
-  int backup;
-  int journal;
+  int journal_remove;
+  int journal_create;
   int update;
   int reconcile;
   int propagate;
@@ -109,23 +108,20 @@ static error_t parse_opt (int key, char *arg, struct argp_state *state) {
   struct argument_s *arguments = state->input;
 
   switch (key) {
-    case 'b':
-      arguments->backup = 1;
-      break;
     case 'j':
-      arguments->journal = 1;
+      arguments->journal_create = 1;
       arguments->update = 1;
       arguments->reconcile = 0;
       arguments->propagate = 0;
       break;
     case 'u':
-      arguments->journal = 0;
+      arguments->journal_create = 0;
       arguments->update = 1;
       arguments->reconcile = 0;
       arguments->propagate = 0;
       break;
     case 'r':
-      arguments->journal = 0;
+      arguments->journal_create = 0;
       arguments->update = 1;
       arguments->reconcile = 1;
       arguments->propagate = 0;
@@ -133,6 +129,9 @@ static error_t parse_opt (int key, char *arg, struct argp_state *state) {
     case KEY_EXCLUDE_FILE:
       arguments->exclude_file = strdup(arg);
       break;
+    case KEY_REMOVE_JOURNAL:
+      arguments->journal_remove = 1;
+      break;
     case ARGP_KEY_ARG:
       if (state->arg_num >= 2) {
         /* Too many arguments. */
@@ -171,8 +170,8 @@ int main(int argc, char **argv) {
 
   /* Default values. */
   arguments.exclude_file = NULL;
-  arguments.backup = 0;
-  arguments.journal = 0;
+  arguments.journal_remove = 0;
+  arguments.journal_create = 0;
   arguments.update = 1;
   arguments.reconcile = 1;
   arguments.propagate = 1;
@@ -191,17 +190,6 @@ int main(int argc, char **argv) {
   csync_set_module_auth_callback(csync, csync_auth_fn);
   fprintf(stdout,"\n");
 
-  if (arguments.backup) {
-    if (csync_set_config_dir(csync, "/tmp/csync_backup") < 0) {
-      perror("csync_set_config_dir");
-      rc = 1;
-      goto out;
-    }
-    if (csync_remove_config_dir(csync) < 0) {
-      perror("csync_remove_config_dir");
-    }
-  }
-
   if (csync_init(csync) < 0) {
     perror("csync_init");
     rc = 1;
@@ -241,12 +229,13 @@ int main(int argc, char **argv) {
     }
   }
 
-  if (arguments.journal) {
+  if (arguments.journal_create) {
     csync_set_status(csync, 0xFFFF);
   }
 
 out:
-  if (arguments.backup) {
+  if (arguments.journal_remove) {
+    csync_remove_journal(csync);
   }
 
   csync_destroy(csync);
diff --git a/src/csync.c b/src/csync.c
index 83dda03290..81fd1fbb22 100644
--- a/src/csync.c
+++ b/src/csync.c
@@ -193,7 +193,7 @@ int csync_init(CSYNC *ctx) {
   }
 
   if (csync_exclude_load(ctx, exclude) < 0) {
-    CSYNC_LOG(CSYNC_LOG_PRIORITY_WARN, "Could not load %s - %s", exclude, strerror(errno));
+    CSYNC_LOG(CSYNC_LOG_PRIORITY_INFO, "Could not load %s - %s", exclude, strerror(errno));
   }
   SAFE_FREE(exclude);
 
@@ -204,7 +204,7 @@ int csync_init(CSYNC *ctx) {
   }
 
   if (csync_exclude_load(ctx, exclude) < 0) {
-    CSYNC_LOG(CSYNC_LOG_PRIORITY_WARN, "Could not load %s - %s", exclude, strerror(errno));
+    CSYNC_LOG(CSYNC_LOG_PRIORITY_INFO, "Could not load %s - %s", exclude, strerror(errno));
   }
 
   /* create/load journal */
@@ -576,6 +576,15 @@ int csync_remove_config_dir(CSYNC *ctx) {
   return 0;
 }
 
+int csync_remove_journal(CSYNC *ctx) {
+  if ((ctx == NULL) || ! (ctx->status & CSYNC_INIT)) {
+    return -1;
+  }
+  unlink(ctx->journal.file);
+
+  return 0;
+}
+
 int csync_set_module_auth_callback(CSYNC *ctx, csync_module_auth_callback cb) {
   if (ctx == NULL || cb == NULL) {
     return -1;
diff --git a/src/csync.h b/src/csync.h
index 6433202895..3afdb717ab 100644
--- a/src/csync.h
+++ b/src/csync.h
@@ -131,6 +131,7 @@ int csync_add_exclude_list(CSYNC *ctx, const char *path);
 char *csync_get_config_dir(CSYNC *ctx);
 int csync_set_config_dir(CSYNC *ctx, const char *path);
 int csync_remove_config_dir(CSYNC *ctx);
+int csync_remove_journal(CSYNC *ctx);
 csync_module_auth_callback csync_get_module_auth_callback(CSYNC *ctx);
 int csync_set_module_auth_callback(CSYNC *ctx, csync_module_auth_callback cb);
 int csync_get_status(CSYNC *ctx);