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
Removed hardlink reporting bug from TODO list -- seems to be
[rsync/rsync.git]
/
io.c
diff --git
a/io.c
b/io.c
index
36d5f1b
..
3ca13df
100644
(file)
--- a/
io.c
+++ b/
io.c
@@
-375,8
+375,7
@@
int read_filesfrom_line(int fd, char *fname)
extern int io_timeout;
extern int eol_nulls;
extern char *remote_filesfrom_file;
extern int io_timeout;
extern int eol_nulls;
extern char *remote_filesfrom_file;
- extern int am_server;
- int reading_remotely = remote_filesfrom_file || (am_server && fd == 0);
+ int reading_remotely = remote_filesfrom_file != NULL;
int nulls = eol_nulls || reading_remotely;
start:
int nulls = eol_nulls || reading_remotely;
start:
@@
-688,7
+687,7
@@
void io_start_buffering(int fd)
{
if (io_buffer) return;
multiplex_out_fd = fd;
{
if (io_buffer) return;
multiplex_out_fd = fd;
- io_buffer =
(char *)malloc(
IO_BUFFER_SIZE);
+ io_buffer =
new_array(char,
IO_BUFFER_SIZE);
if (!io_buffer) out_of_memory("writefd");
io_buffer_count = 0;
}
if (!io_buffer) out_of_memory("writefd");
io_buffer_count = 0;
}