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
The "pid file" was getting created mode 666, not applying the umask
[rsync/rsync.git]
/
main.c
diff --git
a/main.c
b/main.c
index
2846f88
..
0eab26b
100644
(file)
--- a/
main.c
+++ b/
main.c
@@
-42,8
+42,7
@@
static void report(int f)
if (f == -1 || !am_sender) return;
}
if (f == -1 || !am_sender) return;
}
- send_stats = verbose ||
- ((remote_version >= 20) && (PROTOCOL_VERSION >= 20));
+ send_stats = verbose || (remote_version >= 20);
if (am_server) {
if (am_sender && send_stats) {
int64 w;
if (am_server) {
if (am_sender && send_stats) {
int64 w;
@@
-71,7
+70,7
@@
static void report(int f)
if (do_stats) {
if (!am_sender && !send_stats) {
/* missing the bytes written by the generator */
if (do_stats) {
if (!am_sender && !send_stats) {
/* missing the bytes written by the generator */
- rprintf(FINFO, "\nCannot show stats as receiver because protocol version is less than 20\n");
+ rprintf(FINFO, "\nCannot show stats as receiver because
remote
protocol version is less than 20\n");
rprintf(FINFO, "Use --stats -v to show stats\n");
return;
}
rprintf(FINFO, "Use --stats -v to show stats\n");
return;
}
@@
-335,6
+334,7
@@
static void do_server_recv(int f_in, int f_out, int argc,char *argv[])
char *local_name=NULL;
char *dir = NULL;
extern int delete_mode;
char *local_name=NULL;
char *dir = NULL;
extern int delete_mode;
+ extern int delete_excluded;
extern int am_daemon;
if (verbose > 2)
extern int am_daemon;
if (verbose > 2)
@@
-351,7
+351,7
@@
static void do_server_recv(int f_in, int f_out, int argc,char *argv[])
}
}
}
}
- if (delete_mode)
+ if (delete_mode
&& !delete_excluded
)
recv_exclude_list(f_in);
flist = recv_file_list(f_in);
recv_exclude_list(f_in);
flist = recv_file_list(f_in);
@@
-408,9
+408,10
@@
int client_run(int f_in, int f_out, int pid, int argc, char *argv[])
if (am_sender) {
extern int cvs_exclude;
extern int delete_mode;
if (am_sender) {
extern int cvs_exclude;
extern int delete_mode;
+ extern int delete_excluded;
if (cvs_exclude)
add_cvs_excludes();
if (cvs_exclude)
add_cvs_excludes();
- if (delete_mode)
+ if (delete_mode
&& !delete_excluded
)
send_exclude_list(f_out);
flist = send_file_list(f_out,argc,argv);
if (verbose > 3)
send_exclude_list(f_out);
flist = send_file_list(f_out,argc,argv);
if (verbose > 3)