dav: comparison dav/sync.c

-:aa3baf1dd81b
+:a7c48e0dca88
 return -1;
 }
 xmlGenericErrorFunc fnc = xmlerrorfnc;
 initGenericErrorDefaultFunc(&fnc);
+sys_init();
 ctx = dav_context_new();
 int cfgret = load_config(ctx) || load_sync_config();
 pthread_mutex_t mutex = PTHREAD_MUTEX_INITIALIZER;
 pthread_mutex_lock(&mutex);
 free_sync_config();
 curl_global_cleanup();
 xmlCleanupParser();
+sys_uninit();
 return ret;
 }
 void print_usage(char *cmd) {
 fprintf(stderr, "Usage: %s command [options] arguments...\n\n", cmd);
 //
 // the first thing we need are all directories to put the files in
 UCX_FOREACH(elm, res_mkdir) {
 DavResource *res = elm->data;
+char *res_path = resource_local_path(res);
 char *local_path = create_local_path(dir, res->path);
+free(res_path);
 if(sys_mkdir(local_path) && errno != EEXIST) {
 fprintf(stderr,
 "Cannot create directory %s: %s",
 local_path, strerror(errno));
 }
 free(local_path);
+// TODO: create localres for dir
 }
 // we need a map for all conflicts for fast lookups
 UcxMap *conflicts = ucx_map_new(ucx_list_size(res_conflict)+16);
 UCX_FOREACH(elm, res_conflict) {
 LocalResource *local = ucx_map_cstr_get(hashes, hash);
 if(!local) {
 continue;
 }
-char *local_path = util_concat_path(dir->path, local->path);
+char *local_path = util_concat_path(dir->path, local_resource_path(local));
 int staterr = sys_stat(local_path, &s);
 free(local_path);
 if(staterr) {
 // origin doesn't exist or is inaccessible
 continue;
 }
 LocalResource *local = ucx_map_cstr_get(db->resources, res->path);
 if(local) {
 printf("update: %s\n", res->path);
+char *res_path = resource_local_path(res);
 char *local_path = create_local_path(dir, res->path);
+free(res_path);
 if(sync_store_metadata(dir, local_path, local, res)) {
 fprintf(stderr, "Metadata update failed: %s\n", res->path);
 sync_error++;
 } else {
 SYS_STAT s;
 int *counter)
 {
 renamefunc fn = copy ? copy_file : sys_rename;
 char *new_path = util_concat_path(dir->path, res->path);
-char *old_path = util_concat_path(dir->path, content->path);
+char *old_path = util_concat_path(dir->path, local_resource_path(content));
 printf("%s: %s -> %s\n", copy?"copy":"move", content->path, res->path);
 if(fn(old_path, new_path)) {
 free(new_path);
 free(old_path);
 const char *path,
 DavResource *res,
 SyncDatabase *db,
 int *counter)
 {
-LocalResource *local = ucx_map_cstr_get(db->resources, path);
-char *local_path = create_local_path(dir, path);
 char *link = SYNC_SYMLINK(dir) ?
 dav_get_string_property_ns(res, DAV_PROPS_NS, "link") : NULL;
+LocalResource *local = ucx_map_cstr_get(db->resources, path);
+char *local_path;
+if(link) {
+char *res_path = resource_local_path(res);
+local_path = create_local_path(dir, res_path);
+free(res_path);
+} else {
+local_path = create_local_path(dir, path);
+}
 char *etag = dav_get_string_property(res, "D:getetag");
 SYS_STAT s;
 memset(&s, 0, sizeof(SYS_STAT));
 if(local->isdirectory || local->link_target) {
 elm = elm->next;
 continue;
 }
-char *local_path = util_concat_path(dir->path, local->path);
+char *local_path = util_concat_path(dir->path, local_resource_path(local));
 char *hash = util_file_hash(local_path);
 local->hash = hash;
 // check if a file with this hash already exists
 LocalResource *origin = ucx_map_cstr_get(db_hashes, hash);
 if(origin) {
 } else {
 res->path = util_concat_path(path, "/");
 res->isdirectory = 1;
 }
-if(S_ISLNK(s.st_mode)) {
+if(SYS_ISLINK(file_path, s)) {
-off_t l_sz = s.st_size + 16;
+char *lnkbuf = sys_readlink(file_path, &s);
-size_t lnksize = l_sz > 256 ? l_sz : 256;
+#ifdef SYS_LINK_EXT
-char *lnkbuf = malloc(lnksize);
+// on Windows, we interpret .lnk files as links
+// we dont want resource names with this extension
-ssize_t len = 0;
+// and possibly sync this to other operating systems
-for(int i=0;i<4;i++) {
+// therefore we remove the .lnk extension from the file name
-// we try to read the link at most 4 times
+// change res->path
-// only repeat if the buffer is too small
+// we only do this, if there isn't any other file with this name
-len = sys_readlink(file_path, lnkbuf, lnksize);
+sstr_t fpath = sstr(file_path);
-if(len != lnksize) {
+sstr_t rpath = sstr(path);
-break;
+// remove last 4 chars (.lnk)
-}
+sstr_t new_file_path = sstrdup(sstrsubsl(fpath, 0 , fpath.length-4));
-lnksize *= 2;
+// check if a file with this name exists
-lnkbuf = realloc(lnkbuf, lnksize);
+SYS_STAT nfp_s;
-}
+if(!sys_stat(new_file_path.ptr, &nfp_s)) {
+// we can't upload the link without the file extension, because
-if(len > 0) {
+// there is another file with this name
-// readlink successful
+free(lnkbuf);
-lnkbuf[len] = 0;
+lnkbuf = NULL;
+} else {
+sstr_t new_path = sstrdup(sstrsubsl(rpath, 0, rpath.length-4));
+res->local_path = res->path;
+res->path = new_path.ptr; // remove .lnk  ext from resource path
+}
+free(new_file_path.ptr);
+#endif
+if(lnkbuf) {
+// readlink successful
 char *normalized = NULL;
-if(lnkbuf[0] != '/') {
+if(!util_path_isabsolut(lnkbuf)) {
 char *link_parent = util_parent_path(res->path);
 char *abs_link_parent = util_concat_path(dir->path, link_parent);
 char *link = util_concat_path(abs_link_parent, lnkbuf);
 normalized = util_path_normalize(link);
 free(abs_link_parent);
 free(link);
 } else {
 normalized = util_path_normalize(lnkbuf);
 }
-if(util_path_isrelated(dir->path, normalized)) {
+char *dirpath = util_path_normalize(dir->path);
+if(util_path_isrelated(dirpath, normalized)) {
 // the link points to a file inside the syncdir
 char *rel = util_create_relative_path(normalized, file_path);
 res->link_target = rel;
 }
+free(dirpath);
 free(normalized);
-}
+free(lnkbuf);
+}
-free(lnkbuf);
 }
 free(file_path);
 return res;
+}
+char* local_resource_path(LocalResource *res) {
+return res->local_path ? res->local_path : res->path;
 }
 int local_resource_is_changed(
 SyncDirectory *dir,
 SyncDatabase *db,
 }
 }
 return ret;
 }
+char* resource_local_path(DavResource *res) {
+#ifdef SYS_LINK_EXT
+// on Windows, add .lnk extension to links
+if(dav_get_property_ns(res, DAV_PROPS_NS, "link")) {
+return ucx_sprintf("%s%s", res->path, SYS_LINK_EXT).ptr;
+} else {
+// not a link
+return strdup(res->path);
+}
+#else
+return strdup(res->path);
+#endif
+}
 size_t resource_get_blocksize(SyncDirectory *dir, LocalResource *local, DavResource *res, off_t filesize) {
 size_t local_blocksize = 0;
 if(local->blocksize < 0) {
 // file splitting disabled
 return 0;
 return res->cached_tags;
 }
 UcxBuffer *buf = NULL;
 if(dir->tagconfig->store == TAG_STORE_XATTR) {
 ssize_t tag_length = 0;
-char *local_path = create_local_path(dir, res->path);
+char *local_path = create_local_path(dir, local_resource_path(res));
 char* tag_data = xattr_get(
 local_path,
 dir->tagconfig->xattr_name,
 &tag_length);
 free(local_path);
 SyncDirectory *dir,
 DavResource *res,
 LocalResource *local,
 int *counter)
 {
-char *local_path = create_local_path(dir, res->path);
+char *local_path = create_local_path(dir, local_resource_path(local));
 SYS_STAT s;
 if(sys_stat(local_path, &s)) {
 fprintf(stderr, "Cannot stat file: %s\n", local_path);
 perror("");

Mercurial > hg > dav / file comparison

comparison: dav/sync.c

dav/sync.c