[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.154 and 1.155

version 1.154, 2016/12/28 17:48:04 version 1.155, 2017/01/03 17:00:04
Line 167 
Line 167 
         return (epath);          return (epath);
 }  }
   
   /* ARGSUSED */
   static void
   tooslow(int signo)
   {
           dprintf(STDERR_FILENO, "%s: connect taking too long\n", __progname);
           _exit(2);
   }
   
 /*  /*
  * Retrieve URL, via the proxy in $proxyvar if necessary.   * Retrieve URL, via the proxy in $proxyvar if necessary.
  * Modifies the string argument given.   * Modifies the string argument given.
Line 560 
Line 568 
                 }                  }
 #endif /* !SMALL */  #endif /* !SMALL */
   
                   if (connect_timeout) {
                           (void)signal(SIGALRM, tooslow);
                           alarmtimer(connect_timeout);
                   }
   
                 for (error = connect(s, res->ai_addr, res->ai_addrlen);                  for (error = connect(s, res->ai_addr, res->ai_addrlen);
                     error != 0 && errno == EINTR; error = connect_wait(s))                      error != 0 && errno == EINTR; error = connect_wait(s))
                         continue;                          continue;
Line 626 
Line 639 
 #else /* !NOSSL */  #else /* !NOSSL */
         fin = fdopen(s, "r+");          fin = fdopen(s, "r+");
 #endif /* !NOSSL */  #endif /* !NOSSL */
   
           if (connect_timeout) {
                   signal(SIGALRM, SIG_DFL);
                   alarmtimer(0);
           }
   
         /*          /*
          * Construct and send the request. Proxy requests don't want leading /.           * Construct and send the request. Proxy requests don't want leading /.
Legend:
Removed from v.1.154  
changed lines
  Added in v.1.155