Added a remote-shell substitute for use in testing and for certain

[rsync/rsync.git] / main.c

diff --git a/main.c b/main.c
index 410ce29..e9675f9 100644 (file)
--- a/main.c
+++ b/main.c
@@ -7,8 +7,9 @@
  * Copyright (C) 2003-2007 Wayne Davison
  *
  * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -16,8 +17,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
+ * with this program; if not, visit the http://fsf.org website.
  */
 
 #include "rsync.h"
@@ -37,7 +37,6 @@ extern int am_daemon;
 extern int inc_recurse;
 extern int blocking_io;
 extern int remove_source_files;
-extern int daemon_over_rsh;
 extern int need_messages_from_generator;
 extern int kluge_around_eof;
 extern int do_stats;
@@ -71,10 +70,12 @@ extern char *shell_cmd;
 extern char *batch_name;
 extern char *password_file;
 extern char curr_dir[MAXPATHLEN];
+extern struct file_list *cur_flist;
 extern struct filter_list_struct server_filter_list;
 
 int local_server = 0;
 int new_root_dir = 0;
+int daemon_over_rsh = 0;
 mode_t orig_umask = 0;
 int batch_gen_fd = -1;
 
@@ -669,7 +670,7 @@ static void do_server_sender(int f_in, int f_out, int argc, char *argv[])
        }
 
        flist = send_file_list(f_out,argc,argv);
-       if (!flist || flist->count == 0)
+       if (!flist || flist->used == 0)
                exit_cleanup(0);
 
        io_start_buffering_in(f_in);
@@ -695,8 +696,8 @@ static int do_recv(int f_in, int f_out, char *local_name)
        copy_links = copy_dirlinks = 0;
 
 #ifdef SUPPORT_HARD_LINKS
-       if (preserve_hard_links)
-               match_hard_links();
+       if (preserve_hard_links && !inc_recurse)
+               match_hard_links(cur_flist);
 #endif
 
        if (fd_pair(error_pipe) < 0) {
@@ -727,7 +728,7 @@ static int do_recv(int f_in, int f_out, char *local_name)
                io_flush(FULL_FLUSH);
                handle_stats(f_in);
 
-               send_msg(MSG_DONE, "", 1);
+               send_msg(MSG_DONE, "", 1, 0);
                write_varlong(error_pipe[1], stats.total_read, 3);
                io_flush(FULL_FLUSH);
 
@@ -900,7 +901,7 @@ void start_server(int f_in, int f_out, int argc, char *argv[])
 
        io_set_sock_fds(f_in, f_out);
        setup_protocol(f_out, f_in);
-#if defined HAVE_ICONV_OPEN && defined HAVE_ICONV_H
+#ifdef ICONV_CONST
        setup_iconv();
 #endif
 
@@ -937,7 +938,7 @@ int client_run(int f_in, int f_out, pid_t pid, int argc, char *argv[])
 
        io_set_sock_fds(f_in, f_out);
        setup_protocol(f_out,f_in);
-#if defined HAVE_ICONV_OPEN && defined HAVE_ICONV_H
+#ifdef ICONV_CONST
        setup_iconv();
 #endif
 
@@ -1013,7 +1014,7 @@ int client_run(int f_in, int f_out, pid_t pid, int argc, char *argv[])
        if (inc_recurse && file_total == 1)
                recv_additional_file_list(f_in);
 
-       if (flist && flist->count > 0) {
+       if (flist && flist->used > 0) {
                local_name = get_local_name(flist, argv[0]);
 
                fix_basis_dirs();
@@ -1092,16 +1093,9 @@ static int start_client(int argc, char *argv[])
                                        "--files-from hostname is not the same as the transfer hostname\n");
                                exit_cleanup(RERR_SYNTAX);
                        }
-                       if (rsync_port) {
-                               if (!shell_cmd) {
-                                       return start_socket_client(shell_machine,
-                                                                  shell_path,
-                                                                  argc, argv);
-                               }
-                               daemon_over_rsh = 1;
-                       }
-
                        am_sender = 0;
+                       if (rsync_port)
+                               daemon_over_rsh = shell_cmd ? 1 : -1;
                } else { /* source is local, check dest arg */
                        am_sender = 1;
 
@@ -1128,14 +1122,8 @@ static int start_client(int argc, char *argv[])
                                }
                                shell_machine = NULL;
                                shell_path = p;
-                       } else if (rsync_port) {
-                               if (!shell_cmd) {
-                                       return start_socket_client(shell_machine,
-                                                                  shell_path,
-                                                                  argc, argv);
-                               }
-                               daemon_over_rsh = 1;
-                       }
+                       } else if (rsync_port)
+                               daemon_over_rsh = shell_cmd ? 1 : -1;
                }
        } else {  /* read_batch */
                local_server = 1;
@@ -1146,6 +1134,15 @@ static int start_client(int argc, char *argv[])
                }
        }
 
+       /* for remote source, only single dest arg can remain ... */
+       if (!am_sender && argc > 1) {
+               usage(FERROR);
+               exit_cleanup(RERR_SYNTAX);
+       }
+
+       if (daemon_over_rsh < 0)
+               return start_socket_client(shell_machine, shell_path, argc, argv);
+
        if (password_file && !daemon_over_rsh) {
                rprintf(FERROR, "The --password-file option may only be "
                                "used when accessing an rsync daemon.\n");
@@ -1169,12 +1166,6 @@ static int start_client(int argc, char *argv[])
                        shell_path ? shell_path : "");
        }
 
-       /* for remote source, only single dest arg can remain ... */
-       if (!am_sender && argc > 1) {
-               usage(FERROR);
-               exit_cleanup(RERR_SYNTAX);
-       }
-
        /* ... or no dest at all */
        if (!am_sender && argc == 0)
                list_only |= 1;