Matt McCutchen's Web Site
/
rsync
/
rsync.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Switching to GPL 3.
[rsync/rsync.git]
/
main.c
diff --git
a/main.c
b/main.c
index
410ce29
..
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,8
+16,7
@@
* 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"
@@
-727,7
+726,7
@@
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);
+ send_msg(MSG_DONE, "", 1
, 0
);
write_varlong(error_pipe[1], stats.total_read, 3);
io_flush(FULL_FLUSH);
write_varlong(error_pipe[1], stats.total_read, 3);
io_flush(FULL_FLUSH);
@@
-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);
io_set_sock_fds(f_in, f_out);
setup_protocol(f_out, f_in);
-#if
defined HAVE_ICONV_OPEN && defined HAVE_ICONV_H
+#if
def ICONV_CONST
setup_iconv();
#endif
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);
io_set_sock_fds(f_in, f_out);
setup_protocol(f_out,f_in);
-#if
defined HAVE_ICONV_OPEN && defined HAVE_ICONV_H
+#if
def ICONV_CONST
setup_iconv();
#endif
setup_iconv();
#endif