Attachment 106 Details for Bug 257 – I also have to modify sftp-client.c for Watcom to compile or else it complains about invalid type.

[patch] I also have to modify sftp-client.c for Watcom to compile or else it complains about invalid type.

open (text/plain), 2.09 KB, created by Frank Liu on 2002-05-28 06:41:20 AEST

(hide)

Description:

Filename:

MIME Type:

Creator: Frank Liu

Created: 2002-05-28 06:41:20 AEST

Size: 2.09 KB

patch

obsolete

>--- sftp-client.c.frank	Fri Apr  5 20:16:46 2002
>+++ sftp-client.c	Mon May 27 13:34:42 2002
>@@ -816,10 +816,12 @@
> 
> 		/* Send some more requests */
> 		while (num_req < max_req) {
>+#ifdef HAVE_INT64_T
> 			debug3("Request range %llu -> %llu (%d/%d)",
> 			    (unsigned long long)offset,
> 			    (unsigned long long)offset + buflen - 1,
> 			    num_req, max_req);
>+#endif
> 			req = xmalloc(sizeof(*req));
> 			req->id = conn->msg_id++;
> 			req->len = buflen;
>@@ -857,9 +859,11 @@
> 			break;
> 		case SSH2_FXP_DATA:
> 			data = buffer_get_string(&msg, &len);
>+#ifdef HAVE_INT64_T
> 			debug3("Received data %llu -> %llu",
> 			    (unsigned long long)req->offset,
> 			    (unsigned long long)req->offset + len - 1);
>+#endif
> 			if (len > req->len)
> 				fatal("Received more data than asked for "
> 				      "%d > %d", len, req->len);
>@@ -878,11 +882,13 @@
> 				num_req--;
> 			} else {
> 				/* Resend the request for the missing data */
>+#ifdef HAVE_INT64_T
> 				debug3("Short data block, re-requesting "
> 				    "%llu -> %llu (%2d)",
> 				    (unsigned long long)req->offset + len,
> 				    (unsigned long long)req->offset +
> 				    req->len - 1, num_req);
>+#endif
> 				req->id = conn->msg_id++;
> 				req->len -= len;
> 				req->offset += len;
>@@ -896,9 +902,11 @@
> 				if (size > 0 && offset > size) {
> 					/* Only one request at a time
> 					 * after the expected EOF */
>+#ifdef HAVE_INT64_T
> 					debug3("Finish at %llu (%2d)",
> 					    (unsigned long long)offset,
> 					    num_req);
>+#endif
> 					max_req = 1;
> 				}
> 				else if (max_req < conn->num_requests + 1) {
>@@ -1051,8 +1059,10 @@
> 			buffer_put_int64(&msg, offset);
> 			buffer_put_string(&msg, data, len);
> 			send_msg(conn->fd_out, &msg);
>+#ifdef HAVE_INT64_T
> 			debug3("Sent message SSH2_FXP_WRITE I:%d O:%llu S:%u",
> 			       id, (unsigned long long)offset, len);
>+#endif
> 		} else if (TAILQ_FIRST(&acks) == NULL)
> 			break;
> 
>@@ -1091,8 +1101,10 @@
> 				close(local_fd);
> 				goto done;
> 			}
>+#ifdef HAVE_INT64_T
> 			debug3("In write loop, ack for %u %d bytes at %llu",
> 			   ack->id, ack->len, (unsigned long long)ack->offset);
>+#endif
> 			++ackid;
> 			free(ack);
> 		}

Actions: View | Diff

Attachments on bug 257: 105 | 106