Some inplace-checking code should have been inside the #ifdef that
authorWayne Davison <wayned@samba.org>
Sat, 15 Jan 2005 20:22:54 +0000 (20:22 +0000)
committerWayne Davison <wayned@samba.org>
Sat, 15 Jan 2005 20:22:54 +0000 (20:22 +0000)
handles the case where --inplace cannot be supported.

options.c

index edf7214..14c60ce 100644 (file)
--- a/options.c
+++ b/options.c
@@ -952,18 +952,18 @@ int parse_arguments(int *argc, const char ***argv, int frommain)
                        return 0;
                }
                keep_partial = 0;
-#else
-               snprintf(err_buf, sizeof err_buf,
-                        "--inplace is not supported on this %s\n",
-                        am_server ? "server" : "client");
-               return 0;
-#endif
                if (dest_option) {
                        snprintf(err_buf, sizeof err_buf,
                                 "--inplace does not yet work with %s\n",
                                 dest_option);
                        return 0;
                }
+#else
+               snprintf(err_buf, sizeof err_buf,
+                        "--inplace is not supported on this %s\n",
+                        am_server ? "server" : "client");
+               return 0;
+#endif
        } else {
                if (keep_partial && !partial_dir)
                        partial_dir = getenv("RSYNC_PARTIAL_DIR");