[BACK]Return to util.c CVS log [TXT][DIR] Up to [cvs.NetBSD.org] / src / usr.bin / ftp

Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.

Diff for /src/usr.bin/ftp/util.c between version 1.155.6.2 and 1.156

version 1.155.6.2, 2012/10/30 19:00:18 version 1.156, 2011/12/10 05:53:58
Line 1351  get_line(FILE *stream, char *buf, size_t
Line 1351  get_line(FILE *stream, char *buf, size_t
  * error message displayed.)   * error message displayed.)
  */   */
 int  int
 ftp_connect(int sock, const struct sockaddr *name, socklen_t namelen, int pe)  ftp_connect(int sock, const struct sockaddr *name, socklen_t namelen)
 {  {
         int             flags, rv, timeout, error;          int             flags, rv, timeout, error;
         socklen_t       slen;          socklen_t       slen;
Line 1417  ftp_connect(int sock, const struct socka
Line 1417  ftp_connect(int sock, const struct socka
         rv = connect(sock, name, namelen);      /* inititate the connection */          rv = connect(sock, name, namelen);      /* inititate the connection */
         if (rv == -1) {                         /* connection error */          if (rv == -1) {                         /* connection error */
                 if (errno != EINPROGRESS) {     /* error isn't "please wait" */                  if (errno != EINPROGRESS) {     /* error isn't "please wait" */
                         if (pe || (errno != EHOSTUNREACH))  
  connecterror:   connecterror:
                                 warn("Can't connect to `%s:%s'", hname, sname);                          warn("Can't connect to `%s:%s'", hname, sname);
                         return -1;                          return -1;
                 }                  }
   

Legend:
Removed from v.1.155.6.2  
changed lines
  Added in v.1.156

CVSweb <webmaster@jp.NetBSD.org>