Mercurial > hg > dav / changeset

--- a/dav/main.c	Mon Sep 08 12:10:13 2025 +0200
+++ b/dav/main.c	Mon Sep 08 12:15:28 2025 +0200
@@ -127,7 +127,7 @@
 int dav_main(int argc, char **argv) {
     if(argc < 2) {
         fprintf(stderr, "Missing command\n");
-        print_usage(argv[0]);
+        dav_sync_print_usage(argv[0]);
         return -1;
     }
     
@@ -136,7 +136,7 @@
     char *cmd = argv[1];
     CmdArgs *args = cmd_parse_args(argc - 2, argv + 2);
     if(!args) {
-        print_usage(argv[0]);
+        dav_sync_print_usage(argv[0]);
         return -1;
     }
     if(cmd_getoption(args, "noinput")) {
@@ -247,7 +247,7 @@
         } else if(!strcasecmp(cmd, "complete")) {
             ret = cmd_complete(args);
         } else {
-            print_usage(argv[0]);
+            dav_sync_print_usage(argv[0]);
         }
     }
     
@@ -298,7 +298,7 @@
     return NULL;
 }
 
-void print_usage(char *cmd) {
+void dav_sync_print_usage(char *cmd) {
     fprintf(stderr, "Usage: %s command [options] arguments...\n\n", cmd);
     
     fprintf(stderr, "Commands:\n");

--- a/dav/main.h	Mon Sep 08 12:10:13 2025 +0200
+++ b/dav/main.h	Mon Sep 08 12:15:28 2025 +0200
@@ -59,7 +59,7 @@
 
 typedef int(*getfunc)(DavCfgRepository *, GetResource *, CmdArgs *, void *);
     
-void print_usage(char *cmd);
+void dav_sync_print_usage(char *cmd);
 
 int update_progress(DavResource *res, int64_t total, int64_t now, Progress *p);
 void download_progress(DavResource *res, int64_t total, int64_t now, void *data);

--- a/dav/obj.mk	Mon Sep 08 12:10:13 2025 +0200
+++ b/dav/obj.mk	Mon Sep 08 12:15:28 2025 +0200
@@ -28,7 +28,7 @@
 
 DAV_MAIN_SRC  = main.c
 
-SYNC_MAIN_SRC  = sync.c
+SYNC_MAIN_SRC  = sync_main.c
 
 COMMON_SRC  = config.c
 COMMON_SRC += error.c
@@ -41,8 +41,8 @@
 
 DAV_SRC = tar.c
 
-
-SYNC_SRC  = scfg.c
+SYNC_SRC += sync.c
+SYNC_SRC += scfg.c
 SYNC_SRC += db.c
 SYNC_SRC += tags.c
 SYNC_SRC += pull.c

--- a/dav/sync.c	Mon Sep 08 12:10:13 2025 +0200
+++ b/dav/sync.c	Mon Sep 08 12:15:28 2025 +0200
@@ -241,45 +241,6 @@
     return newmap;
 }
 
-int dav_sync_main(int argc, char **argv);
-
-#ifdef _WIN32
-static char* wchar2utf8(const wchar_t *wstr, size_t wlen) {
-    size_t maxlen = wlen * 4;
-    char *ret = malloc(maxlen + 1);
-    int ret_len = WideCharToMultiByte(
-        CP_UTF8,
-        0,
-        wstr,
-        wlen,
-        ret,
-        maxlen,
-        NULL,
-        NULL);
-    ret[ret_len] = 0;
-    return ret;
-}
-
-int wmain(int argc, wchar_t **argv) {
-    char **argv_utf8 = calloc(argc, sizeof(char*));
-    for(int i=0;i<argc;i++) {
-        argv_utf8[i] = wchar2utf8(argv[i], wcslen(argv[i]));
-    }
-    
-    int ret = dav_sync_main(argc, argv_utf8);
-    
-    for(int i=0;i<argc;i++) {
-        free(argv_utf8[i]);
-    }
-    free(argv_utf8);
-    
-    return ret;
-}
-#else
-int main(int argc, char **argv) {
-    return dav_sync_main(argc, argv);
-}
-#endif
 
 int dav_sync_main(int argc, char **argv) {
     orig_argc = argc;
@@ -287,14 +248,14 @@
     
     if(argc < 2) {
         fprintf(stderr, "Missing command\n");
-        print_usage(argv[0]);
+        dav_sync_print_usage(argv[0]);
         return -1;
     }
     
     char *cmd = argv[1];
     CmdArgs *args = cmd_parse_sync_args(argc - 2, argv + 2);
     if(!args) {
-        print_usage(argv[0]);
+        dav_sync_print_usage(argv[0]);
         return -1;
     }
     int ret = EXIT_FAILURE;
@@ -387,7 +348,7 @@
                 || !strcmp(cmd, "check-repositories")) {
             ret = cmd_check_repositories(args);
         } else {
-            print_usage(argv[0]);
+            dav_sync_print_usage(argv[0]);
         }
     }
     
@@ -406,7 +367,7 @@
     return ret;
 }
 
-void print_usage(char *cmd) {
+void dav_sync_print_usage(char *cmd) {
     fprintf(stderr, "Usage: %s command [options] arguments...\n\n", cmd);
     
     fprintf(stderr, "Commands:\n");

--- a/dav/sync.h	Mon Sep 08 12:10:13 2025 +0200
+++ b/dav/sync.h	Mon Sep 08 12:15:28 2025 +0200
@@ -92,7 +92,9 @@
     RemoteChangeType type;
 } RemoteChange;
 
-void print_usage(char *cmd);
+void dav_sync_print_usage(char *cmd);
+
+int dav_sync_main(int argc, char **argv);
 
 #ifndef _WIN32
 pthread_t start_sighandler(pthread_mutex_t *mutex) ;

--- a/dav/xattrtool.c	Mon Sep 08 12:10:13 2025 +0200
+++ b/dav/xattrtool.c	Mon Sep 08 12:15:28 2025 +0200
@@ -46,7 +46,7 @@
 int attrtool_set(int argc, char **argv);
 int attrtool_rm(int argc, char **argv);
 
-void print_usage(char *cmd) {
+void dav_sync_print_usage(char *cmd) {
     fprintf(stderr, "usage %s:\n", cmd);
     fprintf(stderr, "   list <file>\n");
     fprintf(stderr, "   listvalues <file>\n");
@@ -97,7 +97,7 @@
 
 int xattr_tool_main(int argc, char **argv) {
     if(argc < 3) {
-        print_usage(argv[0]);
+        dav_sync_print_usage(argv[0]);
         return 1;
     }
     
@@ -113,7 +113,7 @@
         return attrtool_rm(argc, argv);
     } else {
         fprintf(stderr, "Unknown command\n");
-        print_usage(argv[0]);
+        dav_sync_print_usage(argv[0]);
     }
     
     return 1;
@@ -157,7 +157,7 @@
 int attrtool_get(int argc, char **argv, int raw) {
     if(argc < 4) {
         fprintf(stderr, "Too few arguments\n");
-        print_usage(argv[1]);
+        dav_sync_print_usage(argv[1]);
         return 1;
     }
     
@@ -185,7 +185,7 @@
 int attrtool_set(int argc, char **argv) {
     if(argc < 4) {
         fprintf(stderr, "Too few arguments\n");
-        print_usage(argv[1]);
+        dav_sync_print_usage(argv[1]);
         return 1;
     }
     
@@ -206,7 +206,7 @@
 int attrtool_rm(int argc, char **argv) {
     if(argc < 4) {
         fprintf(stderr, "Too few arguments\n");
-        print_usage(argv[1]);
+        dav_sync_print_usage(argv[1]);
         return 1;
     }