From 4b45ed52f9336222cb4461579a93b0c04b70df0e Mon Sep 17 00:00:00 2001 From: Donald Buczek Date: Fri, 10 Jun 2022 15:38:05 +0200 Subject: [PATCH 01/11] cmiror: Don't free static structures --- cmirror.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/cmirror.c b/cmirror.c index d3acfcf..2402689 100644 --- a/cmirror.c +++ b/cmirror.c @@ -1493,7 +1493,5 @@ int main(int argc_cmdline, char **argv_cmdline) { } master(master_path, slave_user, slave, slave_path); - - g_ptr_array_free(EXCEPTS, TRUE); } } From 746bd6679846da9eb41321886a1054b4f7cf83de Mon Sep 17 00:00:00 2001 From: Donald Buczek Date: Sat, 11 Jun 2022 09:32:01 +0200 Subject: [PATCH 02/11] fn_escape: Escape backslash in filename Fixes: 1c045735e6a0 ("fn_escape: Do not use unicode regex") The commit missed the fact that not only non-graph characters but also the backslash character needs to be escaped. We run into errors when the original filename contains backslash characters like ./udev/links/\x2fdisk\x2fby-id\x2fscsi-35000c50084770037 which is wrongly decoded to ./udev/links//disk/by-id/scsi-35000c50084770037 --- cmirror.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmirror.c b/cmirror.c index 2402689..ecd1f56 100644 --- a/cmirror.c +++ b/cmirror.c @@ -86,7 +86,7 @@ static char **match_re(GRegex *regex, char *string) { static char *fn_escape(char *fn) { GString *out = g_string_sized_new(80); for (char c = *fn++ ; c ; c = *fn++) { - if (isgraph(c)) + if (isgraph(c) && c != '\\') g_string_append_c(out, c); else g_string_append_printf(out, "\\x%02x", (unsigned char)c); From 8260d1c1bc186ad5d60bd0f54f2e413fbb5724ed Mon Sep 17 00:00:00 2001 From: Donald Buczek Date: Sat, 11 Jun 2022 10:28:14 +0200 Subject: [PATCH 03/11] Use _exit() instead of exit() everywhere for aborts --- cmirror.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmirror.c b/cmirror.c index ecd1f56..2efe7d5 100644 --- a/cmirror.c +++ b/cmirror.c @@ -670,7 +670,7 @@ static void slave(char *slave_path) { if (error) die("mkdir: %s\n", error->message); if (wait_status) - exit(1); + _exit(1); } int res = chdir(slave_path); if (res == -1) From c4d1b2e88cf7d0c6d1199c616aaf9ef32b3fc7e7 Mon Sep 17 00:00:00 2001 From: Donald Buczek Date: Sat, 11 Jun 2022 10:32:08 +0200 Subject: [PATCH 04/11] Remove development relict Remove three void expressions which were used in early development to avoid "unused parameter" warnings when the code was incomplete. --- cmirror.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/cmirror.c b/cmirror.c index 2efe7d5..e0b34ea 100644 --- a/cmirror.c +++ b/cmirror.c @@ -1075,9 +1075,6 @@ static gint cmp_g_array_str_rev(gconstpointer a, gconstpointer b) { } static void master(char *master_path, char *slave_user, char *slave, char *slave_path){ - (void)slave_user; - (void)slave; - (void)slave_path; if (chdir(master_path) != 0) die("%s: %m\n", master_path); cache_local_fs(); From a35aa4e5fb5684062601151537208a189e319260 Mon Sep 17 00:00:00 2001 From: Donald Buczek Date: Sat, 11 Jun 2022 11:34:48 +0200 Subject: [PATCH 05/11] Move master-specific code from main() to master() --- cmirror.c | 113 ++++++++++++++++++++++++++---------------------------- 1 file changed, 55 insertions(+), 58 deletions(-) diff --git a/cmirror.c b/cmirror.c index e0b34ea..93ff232 100644 --- a/cmirror.c +++ b/cmirror.c @@ -30,6 +30,8 @@ #include +#define STEAL_POINTER(SRC) ({ void *tmp=*(SRC); *(SRC)=NULL; tmp; }) + static const char *log_prefix; static void warn(const char *restrict fmt, ...) { @@ -1074,7 +1076,58 @@ static gint cmp_g_array_str_rev(gconstpointer a, gconstpointer b) { return 0-strcmp( *(const char **)a, *(const char **)b); } -static void master(char *master_path, char *slave_user, char *slave, char *slave_path){ +static void master(char *master_path, char *target) { + g_autofree char *slave; + g_autofree char *slave_path; + g_autofree char *slave_user; + + EXCEPTS = g_ptr_array_new(); + g_ptr_array_add (EXCEPTS, "./quota.group"); + g_ptr_array_add (EXCEPTS, "./quota.user"); + g_ptr_array_add (EXCEPTS, "./.tags"); + g_ptr_array_add (EXCEPTS, "./.PMIRROR_ENABLED"); + g_ptr_array_add (EXCEPTS, "./.PMIRROR_STATUS"); + g_ptr_array_add (EXCEPTS, "./.PMIRROR_HISTORY"); + if (excepts) { + for (char **p = excepts; *p; p++) { + g_ptr_array_add (EXCEPTS, *p); + } + } + LOCAL_DEV = g_hash_table_new_full(g_int64_hash, g_int64_equal, g_free, NULL); + + { + g_auto(GStrv) match1 = MATCH_RE("^([^:]+):(.+)$", target); // system:/path + if (match1) { + slave_path = STEAL_POINTER(&(match1[2])); + g_auto(GStrv) match2 = MATCH_RE("^([^@]+)@(.+)$", match1[1]); // user@system + if (match2) { + slave_user = STEAL_POINTER(&match2[1]); + slave = STEAL_POINTER(&match2[2]); + } else { + slave_user = g_strdup("root"); + slave = STEAL_POINTER(&match1[1]); + } + } else { + slave = g_strdup(""); + slave_user = g_strdup("root"); + slave_path = g_strdup(target); + } + } + + if (unix_socket) { + if (unix_socket_name) { + char *p=unix_socket_name; + unix_socket_name = g_strdup(p); + } else { + char *tmpdir = getenv("TMPDIR"); + if (!tmpdir) + tmpdir = "/tmp"; + struct passwd *passwd=getpwuid(getuid()); + if (!unix_socket_name) + unix_socket_name = g_strdup_printf("%s/pmirror_setup_%s_%05d", tmpdir, passwd->pw_name, getpid()); + } + } + if (chdir(master_path) != 0) die("%s: %m\n", master_path); cache_local_fs(); @@ -1392,10 +1445,7 @@ static void master(char *master_path, char *slave_user, char *slave, char *slave } } -#define STEAL_POINTER(SRC) ({ void *tmp=*(SRC); *(SRC)=NULL; tmp; }) - int main(int argc_cmdline, char **argv_cmdline) { - GOptionContext *context = g_option_context_new ("blabla bla"); g_option_context_set_help_enabled(context, FALSE); g_option_context_add_main_entries(context, options, NULL); @@ -1436,59 +1486,6 @@ int main(int argc_cmdline, char **argv_cmdline) { } else { if (argc != 3) usage(argv); - char *master_path = argv[1]; - char *target = argv[2]; - g_autofree char *slave; - g_autofree char *slave_path; - g_autofree char *slave_user; - - EXCEPTS = g_ptr_array_new(); - g_ptr_array_add (EXCEPTS, "./quota.group"); - g_ptr_array_add (EXCEPTS, "./quota.user"); - g_ptr_array_add (EXCEPTS, "./.tags"); - g_ptr_array_add (EXCEPTS, "./.PMIRROR_ENABLED"); - g_ptr_array_add (EXCEPTS, "./.PMIRROR_STATUS"); - g_ptr_array_add (EXCEPTS, "./.PMIRROR_HISTORY"); - if (excepts) { - for (char **p = excepts; *p; p++) { - g_ptr_array_add (EXCEPTS, *p); - } - } - LOCAL_DEV = g_hash_table_new_full(g_int64_hash, g_int64_equal, g_free, NULL); - - { - g_auto(GStrv) match1 = MATCH_RE("^([^:]+):(.+)$", target); // system:/path - if (match1) { - slave_path = STEAL_POINTER(&(match1[2])); - g_auto(GStrv) match2 = MATCH_RE("^([^@]+)@(.+)$", match1[1]); // user@system - if (match2) { - slave_user = STEAL_POINTER(&match2[1]); - slave = STEAL_POINTER(&match2[2]); - } else { - slave_user = g_strdup("root"); - slave = STEAL_POINTER(&match1[1]); - } - } else { - slave = g_strdup(""); - slave_user = g_strdup("root"); - slave_path = g_strdup(target); - } - } - - if (unix_socket) { - if (unix_socket_name) { - char *p=unix_socket_name; - unix_socket_name = g_strdup(p); - } else { - char *tmpdir = getenv("TMPDIR"); - if (!tmpdir) - tmpdir = "/tmp"; - struct passwd *passwd=getpwuid(getuid()); - if (!unix_socket_name) - unix_socket_name = g_strdup_printf("%s/pmirror_setup_%s_%05d", tmpdir, passwd->pw_name, getpid()); - } - } - - master(master_path, slave_user, slave, slave_path); + master(argv[1], argv[2]); } } From 6c53f2cbd1ce29f489b257d4d297b5c21569e6e8 Mon Sep 17 00:00:00 2001 From: Donald Buczek Date: Sat, 11 Jun 2022 11:45:05 +0200 Subject: [PATCH 06/11] Add G_SPAWN_LEAVE_DESCRIPTORS_OPEN to g_spawn calls We don't need g_spawn to close our file descriptiors. However, doing so produces unnecessary close() calls and interfers with debugging (e.g. valgrind). --- cmirror.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/cmirror.c b/cmirror.c index 93ff232..34e49e4 100644 --- a/cmirror.c +++ b/cmirror.c @@ -668,7 +668,8 @@ static void slave(char *slave_path) { char *argv[] = { "mkdir", "-p", slave_path, NULL }; gint wait_status; GError *error = NULL; - g_spawn_sync(NULL, argv, NULL, G_SPAWN_SEARCH_PATH, NULL, NULL, NULL, NULL, &wait_status, &error); + g_spawn_sync(NULL, argv, NULL, G_SPAWN_SEARCH_PATH | G_SPAWN_LEAVE_DESCRIPTORS_OPEN, \ + NULL, NULL, NULL, NULL, &wait_status, &error); if (error) die("mkdir: %s\n", error->message); if (wait_status) @@ -962,7 +963,9 @@ static void cache_local_fs(void) { size_t linelen = 0; GPid pid; - if (!g_spawn_async_with_pipes(NULL, argv, NULL, G_SPAWN_SEARCH_PATH+G_SPAWN_DO_NOT_REAP_CHILD, NULL, NULL, &pid, NULL, &pipefd, NULL, &error)) { + if (!g_spawn_async_with_pipes(NULL, argv, NULL, \ + G_SPAWN_SEARCH_PATH | G_SPAWN_DO_NOT_REAP_CHILD | G_SPAWN_LEAVE_DESCRIPTORS_OPEN, \ + NULL, NULL, &pid, NULL, &pipefd, NULL, &error)) { die("%s\n", error->message); } file = fdopen(pipefd, "r"); From ce7a6cb512023722308c04fcce73146cbcefa18e Mon Sep 17 00:00:00 2001 From: Donald Buczek Date: Sat, 11 Jun 2022 14:39:32 +0200 Subject: [PATCH 07/11] Switch to glibc getopt_long The current option parsing code is based on g_option_context_parse from glib. This code doesn't support abbreviated long options. Additionally, there is a possible memory leak with the current implementation, because g_option_context_parse() removes processed options from the argument vector so these strings are not freed when argv runs out of scope. Switch to getopt_long. Because of the differences in the interfaces, we need to change the surrounding code a bit. --- cmirror.c | 117 +++++++++++++++++++++++++++++++----------------------- 1 file changed, 67 insertions(+), 50 deletions(-) diff --git a/cmirror.c b/cmirror.c index 34e49e4..13602c4 100644 --- a/cmirror.c +++ b/cmirror.c @@ -24,6 +24,7 @@ #include #include #include +#include // https://www.manpagez.com/html/glib/glib-2.56.0/glib-Double-ended-Queues.php // http://owww.molgen.mpg.de/~buczek/glib-doc/ @@ -572,10 +573,10 @@ static void receive_file(FILE *in, char *filename, off_t expected_size, mode_t p } __attribute__ ((noreturn)) -static void usage(char **argv) { +static void usage(char *argv0) { fprintf(stderr, "usage: %s [options] path [node:]path\n" - " %s --slave [--local-slave] [--socket-name path] path [options]\n" + " %s --slave [--local-slave] [--socket-name path] [options] path\n" "\n" " options:\n" " --noop dont change anything\n" @@ -599,35 +600,35 @@ static void usage(char **argv) { " --unix-socket EXPERIMENTAL establish data channel over ssh via AF unix sockets\n" " --socket-name PATH EXPERIMENTAL use PATH as name for AF unix sockets\n" " --noatime don't touch atime on sender\n", - argv[0], argv[0]); + argv0, argv0); _exit(1); } -static GOptionEntry options[] = { - { "slave", 0, 0, G_OPTION_ARG_NONE, &slave_mode, 0, 0 }, - { "local-slave", 0, 0, G_OPTION_ARG_NONE, &local_slave, 0, 0 }, - { "unprivileged", 0, 0, G_OPTION_ARG_NONE, &slave_unprivileged, 0, 0 }, - { "noop", 0, 0, G_OPTION_ARG_NONE, &fileop_noop, 0, 0 }, - { "quiet", 0, 0, G_OPTION_ARG_NONE, &quiet, 0, 0 }, - { "fileop_debug", 0, 0, G_OPTION_ARG_NONE, &fileop_debug, 0, 0 }, - { "nodelete", 0, 0, G_OPTION_ARG_NONE, &nodelete, 0, 0 }, // noop - { "delete", 0, 0, G_OPTION_ARG_NONE, &delete, 0, 0 }, - { "debug", 0, 0, G_OPTION_ARG_NONE, &debug, 0, 0 }, - { "lock", 0, 0, G_OPTION_ARG_FILENAME, &lockident, 0, 0 }, - { "safety", 0, 0, G_OPTION_ARG_NONE, &safety, 0, 0 }, - { "identity_file", 0, 0, G_OPTION_ARG_FILENAME, &identity_file, 0, 0 }, - { "mkdir", 0, 0, G_OPTION_ARG_NONE, &mkdir_slave, 0, 0 }, - { "exclude", 0, 0, G_OPTION_ARG_FILENAME_ARRAY, &excepts, 0, 0 }, - { "reduce", 0, 0, G_OPTION_ARG_NONE, &reduce, 0, 0 }, - { "force_status", 0, 0, G_OPTION_ARG_NONE, &force_status, 0, 0 }, - { "bandwidth", 0, 0, G_OPTION_ARG_NONE, &bandwidth, 0, 0 }, - { "allowremotefs", 0, 0, G_OPTION_ARG_NONE, &allowremotefs, 0, 0 }, - { "ssh-opt", 0, 0, G_OPTION_ARG_STRING, &ssh_opt, 0, 0 }, - { "cksum", 0, 0, G_OPTION_ARG_NONE, &cksum, 0, 0 }, - { "nice", 0, 0, G_OPTION_ARG_NONE, &opt_nice, 0, 0 }, - { "unix-socket", 0, 0, G_OPTION_ARG_NONE, &unix_socket, 0, 0 }, - { "socket-name", 0, 0, G_OPTION_ARG_FILENAME, &unix_socket_name, 0, 0 }, - { "noatime", 0, 0, G_OPTION_ARG_NONE, &noatime, 0, 0 }, +static struct option options[] = { + { "slave", 0, &slave_mode, 1 }, + { "local-slave", 0, &local_slave, 1 }, + { "unprivileged", 0, &slave_unprivileged, 1 }, + { "noop", 0, &fileop_noop, 1 }, + { "quiet", 0, &quiet, 1 }, + { "fileop_debug", 0, &fileop_debug, 1 }, + { "nodelete", 0, &nodelete, 1 }, // noop + { "delete", 0, &delete, 1 }, + { "debug", 0, &debug, 1 }, + { "lock", 1, NULL, 100 }, + { "safety", 0, &safety, 1 }, + { "identity_file", 1, NULL, 101 }, + { "mkdir", 0, &mkdir_slave, 1 }, + { "exclude", 1, NULL, 102 }, + { "reduce", 0, &reduce, 1 }, + { "force_status", 0, &force_status, 1 }, + { "bandwidth", 0, &bandwidth, 1 }, + { "allowremotefs", 0, &allowremotefs, 1 }, + { "ssh-opt", 1, NULL, 103 }, + { "cksum", 0, &cksum, 1 }, + { "nice", 0, &opt_nice, 1 }, + { "unix-socket", 0, &unix_socket, 1 }, + { "socket-name", 1, NULL, 104 }, + { "noatime", 0, &noatime, 1 }, { NULL } }; @@ -1448,31 +1449,47 @@ static void master(char *master_path, char *target) { } } -int main(int argc_cmdline, char **argv_cmdline) { - GOptionContext *context = g_option_context_new ("blabla bla"); - g_option_context_set_help_enabled(context, FALSE); - g_option_context_add_main_entries(context, options, NULL); - g_auto(GStrv) argv; - int argc; +int main(int argc, char **argv) { + char *argv0 = argv[0]; + + g_auto(GStrv) argv_from_env = NULL; char *ssh_original_command = getenv("SSH_ORIGINAL_COMMAND"); - if (!ssh_original_command) { - argv = g_strdupv(argv_cmdline); - argc = argc_cmdline; - } else { - argv = g_strsplit(ssh_original_command, " ", 0); + if (ssh_original_command) { + argv_from_env = g_strsplit(ssh_original_command, " ", 0); + argv = argv_from_env; argc = g_strv_length(argv); } - GError *error = NULL; - if (!g_option_context_parse (context, &argc, &argv, &error)) { - usage(argv); + g_autoptr(GStrvBuilder) excepts_builder = g_strv_builder_new(); + while (1) { + int opt = getopt_long(argc, argv, "", options, NULL); + if (opt == -1) + break; + else if (opt == 0) + continue; + else if (opt == 100) + lockident = g_strdup(optarg); + else if (opt == 101) + identity_file = g_strdup(optarg); + else if (opt == 102) + g_strv_builder_add(excepts_builder, g_strdup(optarg)); + else if (opt == 103) + ssh_opt = g_strdup(optarg); + else if (opt == 104) + unix_socket_name = g_strdup(optarg); + else if (opt == '?') + usage(argv0); + else + die("internal error: getopt returned %d\n", opt); } - g_option_context_free(context); + excepts = g_strv_builder_end(excepts_builder); + argv = &argv[optind]; + argc -= optind; if (noatime && cksum) { - warn("%s: --cksum together with --noatime not implemented\n", argv[0]); + warn("%s: --cksum together with --noatime not implemented\n", argv0); _exit(1); } @@ -1483,12 +1500,12 @@ int main(int argc_cmdline, char **argv_cmdline) { } if (slave_mode) { - if (argc != 2) - usage(argv); - slave(argv[1]); + if (argc != 1) + usage(argv0); + slave(argv[0]); } else { - if (argc != 3) - usage(argv); - master(argv[1], argv[2]); + if (argc != 2) + usage(argv0); + master(argv[0], argv[1]); } } From 5282a21fa938bdbf1f08e440ab5b45cabbb50bf0 Mon Sep 17 00:00:00 2001 From: Donald Buczek Date: Sun, 12 Jun 2022 17:06:19 +0200 Subject: [PATCH 08/11] Use g_autofree in a few more places --- cmirror.c | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) diff --git a/cmirror.c b/cmirror.c index 13602c4..aeb9276 100644 --- a/cmirror.c +++ b/cmirror.c @@ -1137,14 +1137,13 @@ static void master(char *master_path, char *target) { cache_local_fs(); if (safety) { - char *safety_file = g_strdup_printf("%s/.PMIRROR_ENABLED", master_path); + g_autofree char *safety_file = g_strdup_printf("%s/.PMIRROR_ENABLED", master_path); if (!g_file_test(safety_file, G_FILE_TEST_EXISTS)) die("safety file %s not found. Terminating\n", safety_file); - g_free(safety_file); } if (lockident) { - char *lockfilename = g_strdup_printf("/var/lock/pmirror.%s.lock", lockident); + g_autofree char *lockfilename = g_strdup_printf("/var/lock/pmirror.%s.lock", lockident); int fd = open(lockfilename, O_WRONLY | O_CREAT, 0777); if (fd == -1) die("%s: %m\n", lockfilename); @@ -1155,7 +1154,6 @@ static void master(char *master_path, char *target) { else die("%s: %m\n", lockfilename); } - g_free(lockfilename); } if (!allowremotefs) { @@ -1326,9 +1324,8 @@ static void master(char *master_path, char *target) { } for (guint i=0 ; ilen ; i++) { - char *escaped_fn = fn_escape((char *)EXCEPTS->pdata[i]); + g_autofree char *escaped_fn = fn_escape((char *)EXCEPTS->pdata[i]); fprintf(out, "! %s\n", escaped_fn); - free(escaped_fn); } GQueue *TODO = g_queue_new(); @@ -1336,7 +1333,7 @@ static void master(char *master_path, char *target) { g_queue_push_tail(TODO, g_strdup(".")); g_autoptr(GArray) entries = g_array_sized_new(FALSE, FALSE, sizeof(char *), 128); while (1) { - char *path = g_queue_pop_head(TODO); + g_autofree char *path = g_queue_pop_head(TODO); if (path == NULL) break; if (is_excepted(path)) @@ -1371,9 +1368,8 @@ static void master(char *master_path, char *target) { if (cksum && fi->type == 'F') { die("chksum not yet implemented\n"); } - char *export = fileinfo_export(fi); + g_autofree char *export = fileinfo_export(fi); fprintf(out, "%s %s %s\n", export, hardlink, sum); - free(export); if (fi->type == 'F') { fflush(out); @@ -1431,7 +1427,6 @@ static void master(char *master_path, char *target) { } entries->len = 0; } - g_free(path); } fputs("% complete\n", out); fclose(out); @@ -1494,9 +1489,8 @@ int main(int argc, char **argv) { } if (opt_nice) { - char *cmd = g_strdup_printf("ionice -c idle -p %d", getpid()); + g_autofree char *cmd = g_strdup_printf("ionice -c idle -p %d", getpid()); system(cmd); - g_free(cmd); } if (slave_mode) { From 67891831f88bf7b6c82cf765b0e20f8516b8ef89 Mon Sep 17 00:00:00 2001 From: Donald Buczek Date: Tue, 14 Jun 2022 10:45:08 +0200 Subject: [PATCH 09/11] Move variable into local block scope --- cmirror.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/cmirror.c b/cmirror.c index aeb9276..f996e47 100644 --- a/cmirror.c +++ b/cmirror.c @@ -1261,12 +1261,11 @@ static void master(char *master_path, char *target) { close(master_to_slave[0]); close(slave_to_master[1]); - int s_data; - FILE *in = fdopen(slave_to_master[0], "r"); FILE *out = fdopen(master_to_slave[1], "w"); if (slave && *slave) { + int s_data; char *line = NULL; size_t linebuf_len = 0; errno = 0; From 9abad42e3808f76c8f46f221c38bbb9c5e2e2c46 Mon Sep 17 00:00:00 2001 From: Donald Buczek Date: Tue, 14 Jun 2022 10:55:52 +0200 Subject: [PATCH 10/11] Unify common code --- cmirror.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/cmirror.c b/cmirror.c index f996e47..bf40d5a 100644 --- a/cmirror.c +++ b/cmirror.c @@ -695,7 +695,6 @@ static void slave(char *slave_path) { die("%s: %m\n", unix_socket_name); listen(s_listen, 1); fprintf(out, "LISTEN %s\n", unix_socket_name); - fflush(out); } else { struct sockaddr_in sockaddr; socklen_t sockaddr_len = sizeof(sockaddr); @@ -705,8 +704,8 @@ static void slave(char *slave_path) { if (res == -1) die("listen: %m\n"); fprintf(out, "LISTEN %d\n", ntohs(sockaddr.sin_port)); - fflush(out); } + fflush(out); s_data = accept(s_listen, NULL, NULL); if (s_data == -1) die("accept: %m\n"); From 15d25c44ba7c4c840fd7020da63d0559a3646b0b Mon Sep 17 00:00:00 2001 From: Donald Buczek Date: Mon, 20 Jun 2022 11:38:31 +0200 Subject: [PATCH 11/11] Don't use --nodelete For some reason lost in ancient times, the slave is started with eitehr --delete or an explicit --nodelete. The later is not required, because that is the default. --- cmirror.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/cmirror.c b/cmirror.c index bf40d5a..15b6d06 100644 --- a/cmirror.c +++ b/cmirror.c @@ -1214,10 +1214,7 @@ static void master(char *master_path, char *target) { if (fileop_noop) g_ptr_array_add(args, "--noop"); if (fileop_debug) g_ptr_array_add(args, "--fileop_debug"); if (debug) g_ptr_array_add(args, "--debug"); - if (delete) - g_ptr_array_add(args, "--delete"); - else - g_ptr_array_add(args, "--nodelete"); + if (delete) g_ptr_array_add(args, "--delete"); if (mkdir_slave) g_ptr_array_add(args, "--mkdir"); if (reduce) g_ptr_array_add(args, "--reduce"); if (force_status) g_ptr_array_add(args, "--force_status");