--- a/dav/config.h Sun Sep 17 13:51:01 2023 +0200 +++ b/dav/config.h Sat Sep 30 16:33:47 2023 +0200 @@ -35,6 +35,8 @@ #include "pwd.h" #include "opt.h" +#include <libidav/config.h> + #ifdef __cplusplus extern "C" { #endif @@ -75,8 +77,13 @@ int check_config_dir(void); char* config_file_path(char *name); + +cxmutstr config_load_file(const char *path); int load_config(DavContext *ctx); +DavConfig* get_config(void); +int store_config(void); + void free_config(void); int load_repository(const xmlNode *reponode); int load_key(const xmlNode *keynode); @@ -101,10 +108,10 @@ int pwdstore_save(PwdStore *pwdstore); -Repository* url2repo_s(cxstring url, char **path); -Repository* url2repo(const char *url, char **path); +//Repository* url2repo_s(cxstring url, char **path); +//Repository* url2repo(const char *url, char **path); -DavSession* connect_to_repo(DavContext *ctx, Repository *repo, char *path, dav_auth_func authfunc, CmdArgs *a); +DavSession* connect_to_repo(DavContext *ctx, DavCfgRepository *repo, const char *path, dav_auth_func authfunc, CmdArgs *a); int request_auth(DavSession *sn, void *userdata);