Switching to GPL 3.

[rsync/rsync.git] / main.c

diff --git a/main.c b/main.c
index 1df9e2f..494adfb 100644 (file)
--- a/main.c
+++ b/main.c
@@ -7,7 +7,7 @@
  * Copyright (C) 2003-2007 Wayne Davison
  *
  * This program is free software; you can redistribute it and/or modify
  * 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
+ * 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,
  * published by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,


@@ -16,11 +16,11 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License along
  * 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 "rsync.h"

+#include "io.h"

 #if defined CONFIG_LOCALE && defined HAVE_LOCALE_H
 #include <locale.h>
 #endif
 #if defined CONFIG_LOCALE && defined HAVE_LOCALE_H
 #include <locale.h>
 #endif


@@ -190,12 +190,12 @@ static void handle_stats(int f)
 
        if (am_server) {
                if (am_sender) {
 
        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) {
                        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;
                        }
                }
                return;


@@ -208,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. */
        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) {
                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. */
                }
        } 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) {
                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);

                }
        }
 }
                }
        }
 }


@@ -726,8 +726,8 @@ static int do_recv(int f_in, int f_out, char *local_name)
                io_flush(FULL_FLUSH);
                handle_stats(f_in);
 
                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
                io_flush(FULL_FLUSH);
 
                /* Handle any keep-alive packets from the post-processing work


@@ -899,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);
 
        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
 
        setup_iconv();
 #endif
 


@@ -936,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);
 
        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
 
        setup_iconv();
 #endif