dav: comparison dav/sync.c

-:e22c29b7ee2f
+:7b73058d782e
 // copy proxy config
 memcpy(ctx->http_proxy, get_http_proxy(), sizeof(Proxy));
 memcpy(ctx->https_proxy, get_https_proxy(), sizeof(Proxy));
 if(load_sync_config()) {
+cmd_args_free(args);
+dav_context_destroy(ctx);
 return EXIT_FAILURE;
 }
 }
 if(!strcmp(cmd, "pull")) {
 } else if(!strcmp(cmd, "list-directories")) {
 ret = list_syncdirs();
 }
 // TODO: cleanup sync config (don't forget to call regfree for regex)
+cmd_args_free(args);
+dav_context_destroy(ctx);
+free_config();
 return ret;
 }
 void print_usage(char *cmd) {
 }
 SyncDatabase *db = load_db(dir->database);
 if(!db) {
 fprintf(stderr, "Cannot load database file: %s\n", dir->database);
+destroy_db(db);
 return -1;
 }
 remove_deleted_conflicts(dir, db);
 char *new_url = NULL;
 if(dir->collection) {
 new_url = util_concat_path(repo->url, dir->collection);
 }
 DavSession *sn = create_session(ctx, repo, new_url ? new_url : repo->url);
+ucx_mempool_reg_destr(sn->mp, db, (ucx_destructor)destroy_db);
 if(new_url) {
 free(new_url);
 }
 if (cmd_getoption(a, "verbose")) {
 curl_easy_setopt(sn->handle, CURLOPT_VERBOSE, 1L);
 if(sstrprefix(e, S("W/"))) {
 e = sstrsubs(e, 2);
 }
 if(!strcmp(e.ptr, local->etag)) {
 // resource is already up-to-date on the client
+free(local_path);
 return 0;
 }
 }
 if(cdt && exists && s.st_mtime != local->last_modified) {
 if(local->etag) {
 free(local->etag);
 }
 // set metadata from stat
-local->etag = etag;
+local->etag = strdup(etag);
 local->last_modified = s.st_mtime;
 local->size = s.st_size;
 } else {
 if(unlink(tmp_path)) {
 fprintf(stderr, "Cannot remove tmp file: %s\n", tmp_path);
 char *new_url = NULL;
 if(dir->collection) {
 new_url = util_concat_path(repo->url, dir->collection);
 }
 DavSession *sn = create_session(ctx, repo, new_url ? new_url : repo->url);
+ucx_mempool_reg_destr(sn->mp, db, (ucx_destructor)destroy_db);
 if(new_url) {
 free(new_url);
 }
 if (cmd_getoption(a, "verbose")) {
 curl_easy_setopt(sn->handle, CURLOPT_VERBOSE, 1L);
 LocalResource *local_res = elm->data;
 if (!res_matches_filter(dir, local_res->path+1)) {
 if(res_isconflict(db, local_res)) {
 printf("skip: %s\n", local_res->path);
 sync_skipped++;
+local_resource_free(local_res);
 continue;
 }
 // upload every changed file
 if (local_resource_is_changed(dir, db, local_res)) {
 }
 } else {
 if(cdt && remote_resource_is_changed(sn, dir, db, local_res)) {
 printf("conflict: %s\n", local_res->path);
 sync_skipped++;
+local_resource_free(local_res);
 continue;
 }
 printf("put: %s\n", local_res->path);
 if(sync_put_resource(dir, res, local_res, &sync_success)) {
 }
 // remove every locally available resource from db->resource
 // the remaining elements are all deleted files
 ucx_map_cstr_put(lclres, local_res->path, local_res);
-ucx_map_cstr_remove(db->resources, local_res->path); // TODO: element leaked
+LocalResource *lr = ucx_map_cstr_remove(db->resources, local_res->path);
+if(lr) {
+local_resource_free(lr);
+}
 }
 }
 ucx_list_free(resources);
 // delete all removed files
 ret = -1;
 }
 // cleanup
 dav_session_destroy(sn);
+ucx_list_free(resources); // content is already freed
 // Report
 if(ret == 0) {
 char *str_success = sync_success == 1 ? "file" : "files";
 char *str_delete = sync_delete == 1 ? "file" : "files";
 }
 for(int i=0;i<numdc;i++) {
 ucx_map_cstr_remove(db->conflict, dc[i]);
 }
+free(dc);
 }
 int cmd_resolve_conflicts(CmdArgs *a) {
 if(a->argc != 1) {
 fprintf(stderr, "Too %s arguments\n", a->argc < 1 ? "few" : "many");
 SyncDatabase *db = load_db(dir->database);
 if(!db) {
 fprintf(stderr, "Cannot load database file: %s\n", dir->database);
 return -1;
 }
+int ret = 0;
 // remove conflicts
 int num_conflict = db->conflict->count;
 //TODO: ucx_map_free_content(db->conflict, destr);
 ucx_map_clear(db->conflict);
 // store db
 if(store_db(db, dir->database)) {
 fprintf(stderr, "Cannot store sync db\n");
 fprintf(stderr, "Abort\n");
-return -1; // TODO: don't return here
+ret = -1;
 }
+destroy_db(db);
 // Report
-char *str_conflict = num_conflict == 1 ? "conflict" : "conflicts";
+if(ret == 0) {
-printf("Result: %d %s resolved\n", num_conflict, str_conflict);
+char *str_conflict = num_conflict == 1 ? "conflict" : "conflicts";
+printf("Result: %d %s resolved\n", num_conflict, str_conflict);
-return 0;
+}
+return ret;
 }
 int cmd_delete_conflicts(CmdArgs *a) {
 if(a->argc != 1) {
 fprintf(stderr, "Too %s arguments\n", a->argc < 1 ? "few" : "many");
 return -1;
 }
 int num_del = 0;
 int num_err = 0;
+int ret = 0;
 // delete all conflict files
 UcxMapIterator i = ucx_map_iterator(db->conflict);
 LocalResource *res;
 UCX_MAP_FOREACH(key, res, i) {
 // store db
 if(store_db(db, dir->database)) {
 fprintf(stderr, "Cannot store sync db\n");
 fprintf(stderr, "Abort\n");
-return -1; // TODO: don't return here
+ret = -1;
 }
+destroy_db(db);
 // Report
-char *str_delete = num_del == 1 ? "file" : "files";
+if(ret == 0) {
-char *str_error = num_err == 1 ? "error" : "errors";
+char *str_delete = num_del == 1 ? "file" : "files";
-printf("Result: %d conflict %s deleted, %d %s\n",
+char *str_error = num_err == 1 ? "error" : "errors";
-num_del, str_delete,
+printf("Result: %d conflict %s deleted, %d %s\n",
-num_err, str_error);
+num_del, str_delete,
+num_err, str_error);
-return 0;
+}
+return ret;
 }
 // TODO: remove code dup (main.c ls_size_str)
 static char* size_str(uint64_t size) {

Mercurial > hg > dav / file comparison

comparison: dav/sync.c

dav/sync.c