(sftp_packet_size): New function.

(sftp_read_packet): Call clearerr after checking for error and
eof.

Rev: src/sftp/buffer.c:1.10
Rev: src/sftp/buffer.h:1.7

src/sftp/buffer.c

@@ -212,7 +212,12 @@ sftp_read_packet(struct sftp_input *i)
   switch (done)
     {
     case 0:
-      return feof(i->f) ? -1 : 0;
+      {
+	int err =  feof(i->f) ? -1 : 0;
+	clearerr( i->f );
+	return err;
+      }
+
     case 4:
       i->left = READ_UINT32(buf);
       return 1;
@@ -603,3 +608,9 @@ sftp_put_attrib(struct sftp_output *o, const struct sftp_attrib *a)
       sftp_put_uint32(o, a->mtime);
     }
 }
+
+int
+sftp_packet_size(struct sftp_output* out)
+{
+  return out->i;
+}

src/sftp/buffer.h

@@ -197,5 +197,8 @@ sftp_make_input(FILE *f);
 struct sftp_output *
 sftp_make_output(FILE *f);
 
+int
+sftp_packet_size(struct sftp_output* out);
+
 
 #endif /* SFTP_BUFFER_H_INCLUDED */