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
A couple more unsigned char changes to silence compiler warnings
[rsync/rsync.git]
/
rsync.c
diff --git
a/rsync.c
b/rsync.c
index
9bd7e42
..
df52b69
100644
(file)
--- a/
rsync.c
+++ b/
rsync.c
@@
-26,6
+26,9
@@
extern int verbose;
extern int dry_run;
extern int preserve_times;
extern int am_root;
extern int dry_run;
extern int preserve_times;
extern int am_root;
+extern int am_server;
+extern int am_sender;
+extern int am_generator;
extern int preserve_uid;
extern int preserve_gid;
extern int preserve_perms;
extern int preserve_uid;
extern int preserve_gid;
extern int preserve_perms;
@@
-93,7
+96,7
@@
int delete_file(char *fname)
if (strcmp(dname,".") == 0
|| strcmp(dname,"..") == 0)
continue;
if (strcmp(dname,".") == 0
|| strcmp(dname,"..") == 0)
continue;
-
snprintf(buf, sizeof(buf), "%s/%s"
, fname, dname);
+
pathjoin(buf, sizeof buf
, fname, dname);
if (verbose > 0)
rprintf(FINFO,"deleting %s\n", buf);
if (delete_file(buf) != 0) {
if (verbose > 0)
rprintf(FINFO,"deleting %s\n", buf);
if (delete_file(buf) != 0) {
@@
-160,7
+163,8
@@
int set_perms(char *fname,struct file_struct *file,STRUCT_STAT *st,
change_gid?file->gid:st->st_gid) != 0) {
/* shouldn't have attempted to change uid or gid
unless have the privilege */
change_gid?file->gid:st->st_gid) != 0) {
/* shouldn't have attempted to change uid or gid
unless have the privilege */
- rprintf(FERROR, "chown %s failed: %s\n",
+ rprintf(FERROR, "%s %s failed: %s\n",
+ change_uid ? "chown" : "chgrp",
full_fname(fname), strerror(errno));
return 0;
}
full_fname(fname), strerror(errno));
return 0;
}
@@
-239,3
+243,8
@@
void finish_transfer(char *fname, char *fnametmp, struct file_struct *file)
set_perms(fname,file,NULL,0);
}
}
set_perms(fname,file,NULL,0);
}
}
+
+const char *who_am_i(void)
+{
+ return am_sender ? "sender" : am_generator ? "generator" : "receiver";
+}