From 5df1fcf2452b92a48cd520c8363064892334f0d2 Mon Sep 17 00:00:00 2001 From: Wayne Davison Date: Wed, 7 Apr 2004 23:09:14 +0000 Subject: [PATCH] If --daemon was specified, exit the option-parsing code before adjusting various default values (the real defaults will get set when the client's options arrive). --- options.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/options.c b/options.c index 67349ac2..26dfd769 100644 --- a/options.c +++ b/options.c @@ -688,6 +688,12 @@ int parse_arguments(int *argc, const char ***argv, int frommain) files_from = alloc_sanitize_path(files_from, curr_dir); } + if (daemon_opt) { + daemon_opt = 0; + am_daemon = 1; + return 1; + } + if (!backup_suffix) backup_suffix = backup_dir ? "" : BACKUP_SUFFIX; backup_suffix_len = strlen(backup_suffix); @@ -750,9 +756,6 @@ int parse_arguments(int *argc, const char ***argv, int frommain) } } - if (daemon_opt) - am_daemon = 1; - return 1; } -- 2.34.1