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]
/
receiver.c
diff --git
a/receiver.c
b/receiver.c
index
21528a7
..
efeb2a9
100644
(file)
--- a/
receiver.c
+++ b/
receiver.c
@@
-6,7
+6,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,
@@
-15,8
+15,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"
@@
-389,7
+388,7
@@
int recv_files(int f_in, char *local_name)
rprintf(FINFO, "recv_files phase=%d\n", phase);
if (phase == 2 && delay_updates)
handle_delayed_updates(local_name);
rprintf(FINFO, "recv_files phase=%d\n", phase);
if (phase == 2 && delay_updates)
handle_delayed_updates(local_name);
- send_msg(MSG_DONE, "", 0);
+ send_msg(MSG_DONE, "", 0
, 0
);
continue;
}
continue;
}
@@
-470,6
+469,8
@@
int recv_files(int f_in, char *local_name)
"(Skipping batched update for \"%s\")\n",
fname);
discard_receive_data(f_in, F_LENGTH(file));
"(Skipping batched update for \"%s\")\n",
fname);
discard_receive_data(f_in, F_LENGTH(file));
+ if (inc_recurse)
+ send_msg_int(MSG_NO_SEND, ndx);
continue;
}
next_gen_ndx = -1;
continue;
}
next_gen_ndx = -1;
@@
-553,6
+554,8
@@
int recv_files(int f_in, char *local_name)
full_fname(fnamecmp));
discard_receive_data(f_in, F_LENGTH(file));
close(fd1);
full_fname(fnamecmp));
discard_receive_data(f_in, F_LENGTH(file));
close(fd1);
+ if (inc_recurse)
+ send_msg_int(MSG_NO_SEND, ndx);
continue;
}
continue;
}
@@
-566,6
+569,8
@@
int recv_files(int f_in, char *local_name)
full_fname(fnamecmp));
discard_receive_data(f_in, F_LENGTH(file));
close(fd1);
full_fname(fnamecmp));
discard_receive_data(f_in, F_LENGTH(file));
close(fd1);
+ if (inc_recurse)
+ send_msg_int(MSG_NO_SEND, ndx);
continue;
}
continue;
}
@@
-599,6
+604,8
@@
int recv_files(int f_in, char *local_name)
discard_receive_data(f_in, F_LENGTH(file));
if (fd1 != -1)
close(fd1);
discard_receive_data(f_in, F_LENGTH(file));
if (fd1 != -1)
close(fd1);
+ if (inc_recurse)
+ send_msg_int(MSG_NO_SEND, ndx);
continue;
}
} else {
continue;
}
} else {
@@
-606,6
+613,8
@@
int recv_files(int f_in, char *local_name)
discard_receive_data(f_in, F_LENGTH(file));
if (fd1 != -1)
close(fd1);
discard_receive_data(f_in, F_LENGTH(file));
if (fd1 != -1)
close(fd1);
+ if (inc_recurse)
+ send_msg_int(MSG_NO_SEND, ndx);
continue;
}
continue;
}
@@
-632,6
+641,8
@@
int recv_files(int f_in, char *local_name)
discard_receive_data(f_in, F_LENGTH(file));
if (fd1 != -1)
close(fd1);
discard_receive_data(f_in, F_LENGTH(file));
if (fd1 != -1)
close(fd1);
+ if (inc_recurse)
+ send_msg_int(MSG_NO_SEND, ndx);
continue;
}
continue;
}