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
Moved the is_in_group() function to uidlist.c.
[rsync/rsync.git]
/
flist.c
diff --git
a/flist.c
b/flist.c
index
9da5c73
..
d41d926
100644
(file)
--- a/
flist.c
+++ b/
flist.c
@@
-924,7
+924,7
@@
struct file_list *send_file_list(int f, int argc, char *argv[])
flist = flist_new();
if (f != -1) {
flist = flist_new();
if (f != -1) {
- io_start_buffering(f);
+ io_start_buffering
_out
(f);
if (filesfrom_fd >= 0) {
if (argv[0] && !push_dir(argv[0], 0)) {
rprintf(FERROR, "push_dir %s failed: %s\n",
if (filesfrom_fd >= 0) {
if (argv[0] && !push_dir(argv[0], 0)) {
rprintf(FERROR, "push_dir %s failed: %s\n",
@@
-1389,13
+1389,13
@@
int f_name_cmp(struct file_struct *f1, struct file_struct *f2)
if (!f2 || !f2->basename)
return 1;
if (!f2 || !f2->basename)
return 1;
- if (!(c1 = f1->dirname)) {
+ if (!(c1 =
(uchar*)
f1->dirname)) {
state1 = fnc_BASE;
state1 = fnc_BASE;
- c1 = f1->basename;
+ c1 =
(uchar*)
f1->basename;
}
}
- if (!(c2 = f2->dirname)) {
+ if (!(c2 =
(uchar*)
f2->dirname)) {
state2 = fnc_BASE;
state2 = fnc_BASE;
- c2 = f2->basename;
+ c2 =
(uchar*)
f2->basename;
}
while (1) {
}
while (1) {
@@
-1405,11
+1405,11
@@
int f_name_cmp(struct file_struct *f1, struct file_struct *f2)
switch (state1) {
case fnc_DIR:
state1 = fnc_SLASH;
switch (state1) {
case fnc_DIR:
state1 = fnc_SLASH;
- c1 = "/";
+ c1 =
(uchar*)
"/";
break;
case fnc_SLASH:
state1 = fnc_BASE;
break;
case fnc_SLASH:
state1 = fnc_BASE;
- c1 = f1->basename;
+ c1 =
(uchar*)
f1->basename;
break;
case fnc_BASE:
break;
break;
case fnc_BASE:
break;
@@
-1419,11
+1419,11
@@
int f_name_cmp(struct file_struct *f1, struct file_struct *f2)
switch (state2) {
case fnc_DIR:
state2 = fnc_SLASH;
switch (state2) {
case fnc_DIR:
state2 = fnc_SLASH;
- c2 = "/";
+ c2 =
(uchar*)
"/";
break;
case fnc_SLASH:
state2 = fnc_BASE;
break;
case fnc_SLASH:
state2 = fnc_BASE;
- c2 = f2->basename;
+ c2 =
(uchar*)
f2->basename;
break;
case fnc_BASE:
if (!*c1)
break;
case fnc_BASE:
if (!*c1)