Add a file tree walker for the update detection.

client/csync_client.c

@@ -112,6 +112,7 @@ int main(int argc, char **argv) {
   printf("Version: %s\n", csync_version());
 
   if (arguments.update) {
+    csync_update(csync);
   }
 
   if (arguments.reconcile) {

src/CMakeLists.txt

@@ -38,6 +38,7 @@ set(csync_SRCS
   csync_journal.c
   csync_lock.c
   csync_util.c
+  csync_update.c
 
   vio/csync_vio.c
   vio/csync_vio_handle.c

src/csync.c

@@ -32,6 +32,8 @@
 #include "csync_exclude.h"
 #include "csync_journal.h"
 
+#include "csync_update.h"
+
 #include "vio/csync_vio.h"
 
 #define CSYNC_LOG_CATEGORY_NAME "csync.api"
@@ -187,6 +189,14 @@ out:
   return rc;
 }
 
+int csync_update(CSYNC *ctx) {
+
+  ctx->replica = LOCAL_REPLICA;
+  csync_ftw(ctx, ctx->local.uri, csync_walker, MAX_DEPTH);
+
+  return 0;
+}
+
 int csync_destroy(CSYNC *ctx) {
   char *lock = NULL;
 

src/csync_update.c

@@ -0,0 +1,167 @@
+/*
+ * libcsync -- a library to sync a directory with another
+ *
+ * Copyright (c) 2008      by Andreas Schneider <mail@cynapses.org>
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ *
+ * vim: ts=2 sw=2 et cindent
+ */
+
+#ifndef _GNU_SOURCE
+#define _GNU_SOURCE
+#endif
+
+#include <errno.h>
+#include <stdio.h>
+
+#include "c_lib.h"
+#include "csync_update.h"
+#include "csync_exclude.h"
+#include "vio/csync_vio.h"
+
+#define CSYNC_LOG_CATEGORY_NAME "csync.updater"
+#include "csync_log.h"
+
+static int csync_detect_update(CSYNC *ctx, const char *file, const csync_vio_file_stat_t *fs, const int type) {
+  if ((file == NULL) || (fs == NULL)) {
+    errno = EINVAL;
+    return -1;
+  }
+
+  return 0;
+}
+
+int csync_walker(CSYNC *ctx, const char *file, const csync_vio_file_stat_t *fs, enum csync_ftw_flags_e flag) {
+  /* Check if file is excluded */
+  if (csync_excluded(ctx, file)) {
+    return 0;
+  }
+
+  switch (flag) {
+    case CSYNC_FTW_FLAG_FILE:
+    case CSYNC_FTW_FLAG_SLINK:
+      switch (fs->mode & S_IFMT) {
+        case S_IFREG:
+        case S_IFLNK:
+          /* TODO: handle symbolic links on unix systems */
+          CSYNC_LOG(CSYNC_LOG_PRIORITY_TRACE, "Detect update for file: %s", file);
+
+          return csync_detect_update(ctx, file, fs, CSYNC_FTW_TYPE_FILE);
+          break;
+        default:
+          break;
+      }
+    case CSYNC_FTW_FLAG_DIR: /* enter directory */
+      CSYNC_LOG(CSYNC_LOG_PRIORITY_TRACE, "Detect update for directory: %s", file);
+
+      return csync_detect_update(ctx, file, fs, CSYNC_FTW_TYPE_DIR);
+    case CSYNC_FTW_FLAG_NSTAT: /* not statable file */
+    case CSYNC_FTW_FLAG_DNR:
+    case CSYNC_FTW_FLAG_DP:
+    case CSYNC_FTW_FLAG_SLN:
+      break;
+  }
+
+  return 0;
+}
+/* File tree walker */
+int csync_ftw(CSYNC *ctx, const char *uri, csync_walker_fn fn, unsigned int depth) {
+  char *filename = NULL;
+  char *d_name = NULL;
+  csync_vio_handle_t *dh = NULL;
+  csync_vio_file_stat_t *dfs = NULL;
+  csync_vio_file_stat_t *fs = NULL;
+  int rc = 0;
+
+  if (uri[0] == '\0') {
+    errno = ENOENT;
+    goto error;
+  }
+
+  if ((dh = csync_vio_opendir(ctx, uri)) == NULL) {
+    /* permission denied */
+    if (errno == EACCES) {
+      return 0;
+    } else {
+      goto error;
+    }
+  }
+
+  while ((dfs = csync_vio_readdir(ctx, dh))) {
+    int flag;
+
+    d_name = dfs->name;
+    if (d_name == NULL) {
+      goto error;
+    }
+
+    /* skip "." and ".." */
+    if (d_name[0] == '.' && (d_name[1] == '\0'
+          || (d_name[1] == '.' && d_name[2] == '\0'))) {
+      csync_vio_file_stat_destroy(dfs);
+      continue;
+    }
+
+    if (asprintf(&filename, "%s/%s", uri, d_name) < 0) {
+      csync_vio_file_stat_destroy(dfs);
+      goto error;
+    }
+
+    fs = csync_vio_file_stat_new();
+    if (csync_vio_stat(ctx, filename, fs) == 0) {
+      if (fs->type == CSYNC_VIO_FILE_TYPE_SYMBOLIC_LINK) {
+        flag = CSYNC_FTW_FLAG_SLINK;
+      } else if (fs->type == CSYNC_VIO_FILE_TYPE_DIRECTORY) {
+        flag = CSYNC_FTW_FLAG_DIR;
+      } else {
+        flag = CSYNC_FTW_FLAG_FILE;
+      }
+    } else {
+      flag = CSYNC_FTW_FLAG_NSTAT;
+    }
+
+    CSYNC_LOG(CSYNC_LOG_PRIORITY_DEBUG, "Walking %s", filename);
+
+    /* Call walker function for each file */
+    rc = fn(ctx, filename, fs, flag);
+    csync_vio_file_stat_destroy(fs);
+
+    if (rc < 0) {
+      csync_vio_closedir(ctx, dh);
+      goto done;
+    }
+
+    if (flag == CSYNC_FTW_FLAG_DIR && depth) {
+      rc = csync_ftw(ctx, filename, fn, depth - 1);
+      if (rc < 0) {
+        csync_vio_closedir(ctx, dh);
+        goto done;
+      }
+    }
+    SAFE_FREE(filename);
+    csync_vio_file_stat_destroy(dfs);
+  }
+  csync_vio_closedir(ctx, dh);
+
+done:
+  csync_vio_file_stat_destroy(dfs);
+  SAFE_FREE(filename);
+  return rc;
+error:
+  SAFE_FREE(filename);
+  return -1;
+}
+

src/csync_update.h

@@ -0,0 +1,53 @@
+/*
+ * libcsync -- a library to sync a directory with another
+ *
+ * Copyright (c) 2008      by Andreas Schneider <mail@cynapses.org>
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ *
+ * vim: ft=c.doxygen ts=2 sw=2 et cindent
+ */
+
+#ifndef _CSYNC_UPDATE_H
+#define _CSYNC_UPDATE_H
+
+#include "csync.h"
+#include "vio/csync_vio_file_stat.h"
+
+/**
+ * Types for files
+ */
+enum csync_ftw_flags_e {
+  CSYNC_FTW_FLAG_FILE,		/* Regular file.  */
+  CSYNC_FTW_FLAG_DIR,		/* Directory.  */
+  CSYNC_FTW_FLAG_DNR,		/* Unreadable directory.  */
+  CSYNC_FTW_FLAG_NSTAT,		/* Unstatable file.  */
+  CSYNC_FTW_FLAG_SLINK,		/* Symbolic link.  */
+  /* These flags are only passed from the `nftw' function.  */
+  CSYNC_FTW_FLAG_DP,		/* Directory, all subdirs have been visited. */
+  CSYNC_FTW_FLAG_SLN		/* Symbolic link naming non-existing file.  */
+};
+
+enum csync_ftw_type_e {
+  CSYNC_FTW_TYPE_FILE,
+  CSYNC_FTW_TYPE_DIR
+};
+
+typedef int (*csync_walker_fn) (CSYNC *ctx, const char *file, const csync_vio_file_stat_t *fs, enum csync_ftw_flags_e flag);
+
+int csync_walker(CSYNC *ctx, const char *file, const csync_vio_file_stat_t *fs, enum csync_ftw_flags_e flag);
+int csync_ftw(CSYNC *ctx, const char *uri, csync_walker_fn fn, unsigned int depth);
+
+#endif /* _CSYNC_UPDATE_H */