Mercurial > hg > dav / file diff

--- a/dav/sync.c	Tue Mar 22 11:51:48 2016 +0100
+++ b/dav/sync.c	Tue Mar 22 13:05:09 2016 +0100
@@ -50,6 +50,7 @@
 
 #include "sync.h"
 #include "ucx/properties.h"
+#include "libidav/session.h"
 
 static DavContext *ctx;
 
@@ -209,6 +210,9 @@
         fprintf(stderr, "Unknown sync dir: %s\n", a->argv[0]);
         return -1;
     }
+    if(scfg_check_dir(dir)) {
+        return -1;
+    }
     
     Repository *repo = get_repository(sstr(dir->repository));
     if(!repo) {
@@ -249,6 +253,10 @@
             fprintf(stderr, "Abort\n");
             return -1;
         }
+        DavLock *lock = dav_get_lock(sn, "/");
+        if(lock) {
+            printf("Lock-Token: %s\n", lock->token);
+        }
         locked = TRUE;
     }
     
@@ -692,6 +700,9 @@
         fprintf(stderr, "Unknown sync dir: %s\n", a->argv[0]);
         return -1;
     }
+    if(scfg_check_dir(dir)) {
+        return -1;
+    }
     
     Repository *repo = get_repository(sstr(dir->repository));
     if(!repo) {
@@ -739,6 +750,10 @@
             fprintf(stderr, "Abort\n");
             return -1;
         }
+        DavLock *lock = dav_get_lock(sn, "/");
+        if(lock) {
+            printf("Lock-Token: %s\n", lock->token);
+        }
         locked = TRUE;
     }
     
@@ -1246,6 +1261,9 @@
         fprintf(stderr, "Unknown sync dir: %s\n", a->argv[0]);
         return -1;
     }
+    if(scfg_check_dir(dir)) {
+        return -1;
+    }
     
     SyncDatabase *db = load_db(dir->database);
     if(!db) {
@@ -1290,6 +1308,9 @@
         fprintf(stderr, "Unknown sync dir: %s\n", a->argv[0]);
         return -1;
     }
+    if(scfg_check_dir(dir)) {
+        return -1;
+    }
     
     SyncDatabase *db = load_db(dir->database);
     if(!db) {
@@ -1421,6 +1442,9 @@
         fprintf(stderr, "Unknown sync dir: %s\n", a->argv[0]);
         return -1;
     }
+    if(scfg_check_dir(syncdir)) {
+        return -1;
+    }
     
     if(!syncdir->trash) {
         printf("trash not configured for %s\n", syncdir->name);