[BACK]Return to sftp-client.c CVS log [TXT][DIR] Up to [local] / src / usr.bin / ssh

Diff for /src/usr.bin/ssh/sftp-client.c between version 1.124 and 1.125

version 1.124, 2016/05/25 23:48:45 version 1.125, 2016/09/12 01:22:38
Line 20 
Line 20 
 /* XXX: remove all logging, only return status codes */  /* XXX: remove all logging, only return status codes */
 /* XXX: copy between two remote sites */  /* XXX: copy between two remote sites */
   
 #include <sys/param.h>  /* MIN MAX */  
 #include <sys/types.h>  #include <sys/types.h>
 #include <sys/poll.h>  #include <sys/poll.h>
 #include <sys/queue.h>  #include <sys/queue.h>
Line 455 
Line 454 
   
         /* Some filexfer v.0 servers don't support large packets */          /* Some filexfer v.0 servers don't support large packets */
         if (ret->version == 0)          if (ret->version == 0)
                 ret->transfer_buflen = MIN(ret->transfer_buflen, 20480);                  ret->transfer_buflen = MINIMUM(ret->transfer_buflen, 20480);
   
         ret->limit_kbps = limit_kbps;          ret->limit_kbps = limit_kbps;
         if (ret->limit_kbps > 0) {          if (ret->limit_kbps > 0) {
Line 1344 
Line 1343 
                                     req->offset, req->len, handle, handle_len);                                      req->offset, req->len, handle, handle_len);
                                 /* Reduce the request size */                                  /* Reduce the request size */
                                 if (len < buflen)                                  if (len < buflen)
                                         buflen = MAX(MIN_READ_SIZE, len);                                          buflen = MAXIMUM(MIN_READ_SIZE, len);
                         }                          }
                         if (max_req > 0) { /* max_req = 0 iff EOF received */                          if (max_req > 0) { /* max_req = 0 iff EOF received */
                                 if (size > 0 && offset > size) {                                  if (size > 0 && offset > size) {
Legend:
Removed from v.1.124  
changed lines
  Added in v.1.125