Switching to GPL 3.

[rsync/rsync.git] / main.c

diff --git a/main.c b/main.c
index 5371b14..494adfb 100644 (file)
--- a/main.c
+++ b/main.c
@@ -4,12 +4,11 @@
  * Copyright (C) 1996-2001 Andrew Tridgell <tridge@samba.org>
  * Copyright (C) 1996 Paul Mackerras
  * Copyright (C) 2001, 2002 Martin Pool <mbp@samba.org>
- * Copyright (C) 2003, 2004, 2005, 2006 Wayne Davison
+ * 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 as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+ * it under the terms of the GNU General Public License version 3 as
+ * published by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -17,11 +16,11 @@
  * 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"
+#include "io.h"
 #if defined CONFIG_LOCALE && defined HAVE_LOCALE_H
 #include <locale.h>
 #endif
@@ -34,7 +33,7 @@ extern int am_server;
 extern int am_sender;
 extern int am_generator;
 extern int am_daemon;
-extern int incremental;
+extern int inc_recurse;
 extern int blocking_io;
 extern int remove_source_files;
 extern int daemon_over_rsh;
@@ -191,12 +190,12 @@ static void handle_stats(int f)
 
        if (am_server) {
                if (am_sender) {
-                       write_longint(f, total_read);
-                       write_longint(f, total_written);
-                       write_longint(f, stats.total_size);
+                       write_varlong30(f, total_read, 3);
+                       write_varlong30(f, total_written, 3);
+                       write_varlong30(f, stats.total_size, 3);
                        if (protocol_version >= 29) {
-                               write_longint(f, stats.flist_buildtime);
-                               write_longint(f, stats.flist_xfertime);
+                               write_varlong30(f, stats.flist_buildtime, 3);
+                               write_varlong30(f, stats.flist_xfertime, 3);
                        }
                }
                return;
@@ -209,22 +208,22 @@ static void handle_stats(int f)
        else if (!am_sender) {
                /* Read the first two in opposite order because the meaning of
                 * read/write swaps when switching from sender to receiver. */
-               total_written = read_longint(f);
-               total_read = read_longint(f);
-               stats.total_size = read_longint(f);
+               total_written = read_varlong30(f, 3);
+               total_read = read_varlong30(f, 3);
+               stats.total_size = read_varlong30(f, 3);
                if (protocol_version >= 29) {
-                       stats.flist_buildtime = read_longint(f);
-                       stats.flist_xfertime = read_longint(f);
+                       stats.flist_buildtime = read_varlong30(f, 3);
+                       stats.flist_xfertime = read_varlong30(f, 3);
                }
        } else if (write_batch) {
                /* The --read-batch process is going to be a client
                 * receiver, so we need to give it the stats. */
-               write_longint(batch_fd, total_read);
-               write_longint(batch_fd, total_written);
-               write_longint(batch_fd, stats.total_size);
+               write_varlong30(batch_fd, total_read, 3);
+               write_varlong30(batch_fd, total_written, 3);
+               write_varlong30(batch_fd, stats.total_size, 3);
                if (protocol_version >= 29) {
-                       write_longint(batch_fd, stats.flist_buildtime);
-                       write_longint(batch_fd, stats.flist_xfertime);
+                       write_varlong30(batch_fd, stats.flist_buildtime, 3);
+                       write_varlong30(batch_fd, stats.flist_xfertime, 3);
                }
        }
 }
@@ -609,7 +608,7 @@ static void fix_basis_dirs(void)
 }
 
 /* This is only called by the sender. */
-static void read_final_goodbye(int f_in, int f_out)
+static void read_final_goodbye(int f_in)
 {
        int i, iflags, xlen;
        uchar fnamecmp_type;
@@ -618,8 +617,8 @@ static void read_final_goodbye(int f_in, int f_out)
        if (protocol_version < 29)
                i = read_int(f_in);
        else {
-               i = read_ndx_and_attrs(f_in, f_out, &iflags,
-                                      &fnamecmp_type, xname, &xlen);
+               i = read_ndx_and_attrs(f_in, &iflags, &fnamecmp_type,
+                                      xname, &xlen);
        }
 
        if (i != NDX_DONE) {
@@ -678,7 +677,7 @@ static void do_server_sender(int f_in, int f_out, int argc, char *argv[])
        io_flush(FULL_FLUSH);
        handle_stats(f_out);
        if (protocol_version >= 24)
-               read_final_goodbye(f_in, f_out);
+               read_final_goodbye(f_in);
        io_flush(FULL_FLUSH);
        exit_cleanup(0);
 }
@@ -727,8 +726,8 @@ 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);
-               write_longint(error_pipe[1], stats.total_read);
+               send_msg(MSG_DONE, "", 1, 0);
+               write_varlong(error_pipe[1], stats.total_read, 3);
                io_flush(FULL_FLUSH);
 
                /* Handle any keep-alive packets from the post-processing work
@@ -741,7 +740,7 @@ static int do_recv(int f_in, int f_out, char *local_name)
                        kluge_around_eof = -1;
 
                        /* This should only get stopped via a USR2 signal. */
-                       read_ndx_and_attrs(f_in, -1, &iflags, &fnamecmp_type,
+                       read_ndx_and_attrs(f_in, &iflags, &fnamecmp_type,
                                           xname, &xlen);
 
                        rprintf(FERROR, "Invalid packet at end of run [%s]\n",
@@ -844,7 +843,7 @@ static void do_server_recv(int f_in, int f_out, int argc, char *argv[])
                rprintf(FERROR,"server_recv: recv_file_list error\n");
                exit_cleanup(RERR_FILESELECT);
        }
-       if (incremental && file_total == 1)
+       if (inc_recurse && file_total == 1)
                recv_additional_file_list(f_in);
        verbose = save_verbose;
 
@@ -900,7 +899,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 +936,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
 
@@ -978,7 +977,7 @@ int client_run(int f_in, int f_out, pid_t pid, int argc, char *argv[])
                io_flush(FULL_FLUSH);
                handle_stats(-1);
                if (protocol_version >= 24)
-                       read_final_goodbye(f_in, f_out);
+                       read_final_goodbye(f_in);
                if (pid != -1) {
                        if (verbose > 3)
                                rprintf(FINFO,"client_run waiting on %d\n", (int) pid);
@@ -1010,7 +1009,7 @@ int client_run(int f_in, int f_out, pid_t pid, int argc, char *argv[])
        if (write_batch && !am_server)
                start_write_batch(f_in);
        flist = recv_file_list(f_in);
-       if (incremental && file_total == 1)
+       if (inc_recurse && file_total == 1)
                recv_additional_file_list(f_in);
 
        if (flist && flist->count > 0) {