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
Document --skip-compress.
[rsync/rsync.git]
/
io.c
diff --git
a/io.c
b/io.c
index
51b4ca3
..
d5f42cd
100644
(file)
--- a/
io.c
+++ b/
io.c
@@
-7,8
+7,9
@@
* 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
- * published by the Free Software Foundation.
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
@@
-16,8
+17,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.
*/
/* Rsync provides its own multiplexing system, which is used to send
*/
/* Rsync provides its own multiplexing system, which is used to send
@@
-445,13
+445,13
@@
static void decrement_flist_in_progress(int ndx, int redo)
rprintf(FERROR,
"Invalid file index: %d (%d - %d) [%s]\n",
ndx, first_flist->ndx_start,
rprintf(FERROR,
"Invalid file index: %d (%d - %d) [%s]\n",
ndx, first_flist->ndx_start,
- first_flist->prev->ndx_
start + first_flist->prev->count - 1
,
+ first_flist->prev->ndx_
end
,
who_am_i());
exit_cleanup(RERR_PROTOCOL);
}
flist = flist->prev;
}
who_am_i());
exit_cleanup(RERR_PROTOCOL);
}
flist = flist->prev;
}
- while (ndx >
= flist->ndx_start + flist->count
) {
+ while (ndx >
flist->ndx_end
) {
if (!(flist = flist->next))
goto invalid_ndx;
}
if (!(flist = flist->next))
goto invalid_ndx;
}
@@
-877,7
+877,7
@@
void maybe_send_keepalive(void)
if (protocol_version >= 30)
send_msg(MSG_NOOP, "", 0, 0);
else {
if (protocol_version >= 30)
send_msg(MSG_NOOP, "", 0, 0);
else {
- write_int(sock_f_out, cur_flist->
count
);
+ write_int(sock_f_out, cur_flist->
used
);
write_shortint(sock_f_out, ITEM_IS_NEW);
}
}
write_shortint(sock_f_out, ITEM_IS_NEW);
}
}