Changed implied_dirs to only be non-0 if relative_paths is non-0.
authorWayne Davison <wayned@samba.org>
Fri, 22 Jul 2005 19:05:25 +0000 (19:05 +0000)
committerWayne Davison <wayned@samba.org>
Fri, 22 Jul 2005 19:05:25 +0000 (19:05 +0000)
options.c

index 2d752bf..9f77dad 100644 (file)
--- a/options.c
+++ b/options.c
@@ -973,6 +973,8 @@ int parse_arguments(int *argc, const char ***argv, int frommain)
 
        if (relative_paths < 0)
                relative_paths = files_from? 1 : 0;
+       if (!relative_paths)
+               implied_dirs = 0;
 
        if (!!delete_before + delete_during + delete_after > 1) {
                snprintf(err_buf, sizeof err_buf,
@@ -1471,7 +1473,7 @@ void server_options(char **args,int *argc)
                if (!relative_paths)
                        args[ac++] = "--no-relative";
        }
-       if (!implied_dirs && !am_sender)
+       if (relative_paths && !implied_dirs && !am_sender)
                args[ac++] = "--no-implied-dirs";
 
        if (fuzzy_basis && am_sender)