summaryrefslogtreecommitdiff
path: root/rsync/buf.c
Unidiff
Diffstat (limited to 'rsync/buf.c') (more/less context) (ignore whitespace changes)
-rw-r--r--rsync/buf.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/rsync/buf.c b/rsync/buf.c
index c978fff..fdd67ee 100644
--- a/rsync/buf.c
+++ b/rsync/buf.c
@@ -67,121 +67,123 @@ struct rs_filebuf {
67 67
68 68
69 69
70rs_filebuf_t *rs_filebuf_new(FILE *f, size_t buf_len) 70rs_filebuf_t *rs_filebuf_new(FILE *f, size_t buf_len)
71{ 71{
72 rs_filebuf_t *pf = rs_alloc_struct(rs_filebuf_t); 72 rs_filebuf_t *pf = rs_alloc_struct(rs_filebuf_t);
73 73
74 pf->buf = rs_alloc(buf_len, "file buffer"); 74 pf->buf = rs_alloc(buf_len, "file buffer");
75 pf->buf_len = buf_len; 75 pf->buf_len = buf_len;
76 pf->f = f; 76 pf->f = f;
77 77
78 return pf; 78 return pf;
79} 79}
80 80
81 81
82void rs_filebuf_free(rs_filebuf_t *fb) 82void rs_filebuf_free(rs_filebuf_t *fb)
83{ 83{
84 if ( fb->buf ) 84 if ( fb->buf )
85 free ( fb->buf ); 85 free ( fb->buf );
86 rs_bzero(fb, sizeof *fb); 86 rs_bzero(fb, sizeof *fb);
87 free(fb); 87 free(fb);
88} 88}
89 89
90 90
91/* 91/*
92 * If the stream has no more data available, read some from F into 92 * If the stream has no more data available, read some from F into
93 * BUF, and let the stream use that. On return, SEEN_EOF is true if 93 * BUF, and let the stream use that. On return, SEEN_EOF is true if
94 * the end of file has passed into the stream. 94 * the end of file has passed into the stream.
95 */ 95 */
96rs_result rs_infilebuf_fill(rs_job_t *job, rs_buffers_t *buf, 96rs_result rs_infilebuf_fill(rs_job_t *job, rs_buffers_t *buf,
97 void *opaque) 97 void *opaque)
98{ 98{
99 job=job;
100 int len; 99 int len;
101 rs_filebuf_t *fb = (rs_filebuf_t *) opaque; 100 rs_filebuf_t *fb = (rs_filebuf_t *) opaque;
102 FILE *f = fb->f; 101 FILE *f = fb->f;
102
103 job=job; // fix unused warning
103 104
104 /* This is only allowed if either the buf has no input buffer 105 /* This is only allowed if either the buf has no input buffer
105 * yet, or that buffer could possibly be BUF. */ 106 * yet, or that buffer could possibly be BUF. */
106 if (buf->next_in != NULL) { 107 if (buf->next_in != NULL) {
107 assert(buf->avail_in <= fb->buf_len); 108 assert(buf->avail_in <= fb->buf_len);
108 assert(buf->next_in >= fb->buf); 109 assert(buf->next_in >= fb->buf);
109 assert(buf->next_in <= fb->buf + fb->buf_len); 110 assert(buf->next_in <= fb->buf + fb->buf_len);
110 } else { 111 } else {
111 assert(buf->avail_in == 0); 112 assert(buf->avail_in == 0);
112 } 113 }
113 114
114 if (buf->eof_in || (buf->eof_in = feof(f))) { 115 if (buf->eof_in || (buf->eof_in = feof(f))) {
115 rs_trace("seen end of file on input"); 116 rs_trace("seen end of file on input");
116 buf->eof_in = 1; 117 buf->eof_in = 1;
117 return RS_DONE; 118 return RS_DONE;
118 } 119 }
119 120
120 if (buf->avail_in) 121 if (buf->avail_in)
121 /* Still some data remaining. Perhaps we should read 122 /* Still some data remaining. Perhaps we should read
122 anyhow? */ 123 anyhow? */
123 return RS_DONE; 124 return RS_DONE;
124 125
125 len = fread(fb->buf, 1, fb->buf_len, f); 126 len = fread(fb->buf, 1, fb->buf_len, f);
126 if (len < 0) { 127 if (len < 0) {
127 if (ferror(f)) { 128 if (ferror(f)) {
128 rs_error("error filling buf from file: %s", 129 rs_error("error filling buf from file: %s",
129 strerror(errno)); 130 strerror(errno));
130 return RS_IO_ERROR; 131 return RS_IO_ERROR;
131 } else { 132 } else {
132 rs_error("no error bit, but got %d return when trying to read", 133 rs_error("no error bit, but got %d return when trying to read",
133 len); 134 len);
134 return RS_IO_ERROR; 135 return RS_IO_ERROR;
135 } 136 }
136 } 137 }
137 buf->avail_in = len; 138 buf->avail_in = len;
138 buf->next_in = fb->buf; 139 buf->next_in = fb->buf;
139 140
140 return RS_DONE; 141 return RS_DONE;
141} 142}
142 143
143 144
144/* 145/*
145 * The buf is already using BUF for an output buffer, and probably 146 * The buf is already using BUF for an output buffer, and probably
146 * contains some buffered output now. Write this out to F, and reset 147 * contains some buffered output now. Write this out to F, and reset
147 * the buffer cursor. 148 * the buffer cursor.
148 */ 149 */
149rs_result rs_outfilebuf_drain(rs_job_t *job, rs_buffers_t *buf, void *opaque) 150rs_result rs_outfilebuf_drain(rs_job_t *job, rs_buffers_t *buf, void *opaque)
150{ 151{
151 job=job;
152 int present; 152 int present;
153 rs_filebuf_t *fb = (rs_filebuf_t *) opaque; 153 rs_filebuf_t *fb = (rs_filebuf_t *) opaque;
154 FILE *f = fb->f; 154 FILE *f = fb->f;
155 155
156 job=job; // fix unused warning
157
156 /* This is only allowed if either the buf has no output buffer 158 /* This is only allowed if either the buf has no output buffer
157 * yet, or that buffer could possibly be BUF. */ 159 * yet, or that buffer could possibly be BUF. */
158 if (buf->next_out == NULL) { 160 if (buf->next_out == NULL) {
159 assert(buf->avail_out == 0); 161 assert(buf->avail_out == 0);
160 162
161 buf->next_out = fb->buf; 163 buf->next_out = fb->buf;
162 buf->avail_out = fb->buf_len; 164 buf->avail_out = fb->buf_len;
163 165
164 return RS_DONE; 166 return RS_DONE;
165 } 167 }
166 168
167 assert(buf->avail_out <= fb->buf_len); 169 assert(buf->avail_out <= fb->buf_len);
168 assert(buf->next_out >= fb->buf); 170 assert(buf->next_out >= fb->buf);
169 assert(buf->next_out <= fb->buf + fb->buf_len); 171 assert(buf->next_out <= fb->buf + fb->buf_len);
170 172
171 present = buf->next_out - fb->buf; 173 present = buf->next_out - fb->buf;
172 if (present > 0) { 174 if (present > 0) {
173 int result; 175 int result;
174 176
175 assert(present > 0); 177 assert(present > 0);
176 178
177 result = fwrite(fb->buf, 1, present, f); 179 result = fwrite(fb->buf, 1, present, f);
178 if (present != result) { 180 if (present != result) {
179 rs_error("error draining buf to file: %s", 181 rs_error("error draining buf to file: %s",
180 strerror(errno)); 182 strerror(errno));
181 return RS_IO_ERROR; 183 return RS_IO_ERROR;
182 } 184 }
183 185
184 buf->next_out = fb->buf; 186 buf->next_out = fb->buf;
185 buf->avail_out = fb->buf_len; 187 buf->avail_out = fb->buf_len;
186 } 188 }
187 189