[BACK]Return to fetch.c CVS log [TXT][DIR] Up to [local] / src / usr.bin / ftp

Diff for /src/usr.bin/ftp/fetch.c between version 1.151 and 1.152

version 1.151, 2016/12/08 19:59:51 version 1.152, 2016/12/16 17:44:59
Line 177 
Line 177 
         char *hosttail, *cause = "unknown", *newline, *host, *port, *buf = NULL;          char *hosttail, *cause = "unknown", *newline, *host, *port, *buf = NULL;
         char *epath, *redirurl, *loctail, *h, *p;          char *epath, *redirurl, *loctail, *h, *p;
         int error, i, isftpurl = 0, isfileurl = 0, isredirect = 0, rval = -1;          int error, i, isftpurl = 0, isfileurl = 0, isredirect = 0, rval = -1;
         struct addrinfo hints, *res0, *res, *ares = NULL;          struct addrinfo hints, *res0, *res;
         const char * volatile savefile;          const char * volatile savefile;
         char * volatile proxyurl = NULL;          char * volatile proxyurl = NULL;
         char *credentials = NULL;          char *credentials = NULL;
Line 193 
Line 193 
         char *locbase, *full_host = NULL;          char *locbase, *full_host = NULL;
         const char *scheme;          const char *scheme;
         int ishttpurl = 0, ishttpsurl = 0;          int ishttpurl = 0, ishttpsurl = 0;
           struct addrinfo *ares = NULL;
 #endif /* !SMALL */  #endif /* !SMALL */
         struct tls *tls = NULL;          struct tls *tls = NULL;
         int status;          int status;
Line 1456 
Line 1457 
 size_t  size_t
 ftp_read(FILE *fp, struct tls *tls, char *buf, size_t len)  ftp_read(FILE *fp, struct tls *tls, char *buf, size_t len)
 {  {
   #ifndef SMALL
         ssize_t tls_ret;          ssize_t tls_ret;
   #endif
         size_t ret = 0;          size_t ret = 0;
   
         if (fp != NULL)          if (fp != NULL)

Legend:
Removed from v.1.151  
changed lines
  Added in v.1.152