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
If we discover a hardlink with -vv say what it's a link to.
[rsync/rsync.git]
/
io.c
diff --git
a/io.c
b/io.c
index
3c0b790
..
ed6a70c
100644
(file)
--- a/
io.c
+++ b/
io.c
@@
-2,7
+2,7
@@
Copyright (C) 1996-2001 by Andrew Tridgell
Copyright (C) Paul Mackerras 1996
Copyright (C) 1996-2001 by Andrew Tridgell
Copyright (C) Paul Mackerras 1996
- Copyright (C) 2001 by Martin Pool <mbp@samba.org>
+ Copyright (C) 2001
, 2002
by Martin Pool <mbp@samba.org>
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@
-20,7
+20,6
@@
*/
/**
*/
/**
- *
* @file io.c
*
* Socket and pipe IO utilities used in rsync.
* @file io.c
*
* Socket and pipe IO utilities used in rsync.
@@
-454,8
+453,11
@@
static void writefd_unbuffered(int fd,char *buf,size_t len)
}
if (ret <= 0) {
}
if (ret <= 0) {
- rprintf(FERROR,
- "error writing %d unbuffered bytes"
+ /* Don't try to write errors back
+ * across the stream */
+ io_multiplexing_close();
+ rprintf(FERROR, RSYNC_NAME
+ ": error writing %d unbuffered bytes"
" - exiting: %s\n", len,
strerror(errno));
exit_cleanup(RERR_STREAMIO);
" - exiting: %s\n", len,
strerror(errno));
exit_cleanup(RERR_STREAMIO);
@@
-621,12
+623,19
@@
void write_byte(int f,unsigned char c)
+/**
+ * Read a line of up to @p maxlen characters into @p buf. Does not
+ * contain a trailing newline or carriage return.
+ *
+ * @return 1 for success; 0 for io error or truncation.
+ **/
int read_line(int f, char *buf, size_t maxlen)
{
while (maxlen) {
buf[0] = 0;
read_buf(f, buf, 1);
int read_line(int f, char *buf, size_t maxlen)
{
while (maxlen) {
buf[0] = 0;
read_buf(f, buf, 1);
- if (buf[0] == 0) return 0;
+ if (buf[0] == 0)
+ return 0;
if (buf[0] == '\n') {
buf[0] = 0;
break;
if (buf[0] == '\n') {
buf[0] = 0;
break;