diff options
| author | fenner <fenner@FreeBSD.org> | 2002-09-17 05:54:33 +0000 |
|---|---|---|
| committer | fenner <fenner@FreeBSD.org> | 2002-09-17 05:54:33 +0000 |
| commit | dd87f608a38d2d4d0afacbd9c481605cf68b1565 (patch) | |
| tree | a41fa6f3686892d2962027e74dfb5742f3f39fc4 /lib/libfetch | |
| parent | 024665d45e967fede40c4d15da08470800f4bd63 (diff) | |
| download | FreeBSD-src-dd87f608a38d2d4d0afacbd9c481605cf68b1565.zip FreeBSD-src-dd87f608a38d2d4d0afacbd9c481605cf68b1565.tar.gz | |
Make _fetch_connect() always set the error code.
Tell ftp that _fetch_connect() always sets the error code (http already knew)
Diffstat (limited to 'lib/libfetch')
| -rw-r--r-- | lib/libfetch/common.c | 4 | ||||
| -rw-r--r-- | lib/libfetch/ftp.c | 5 |
2 files changed, 5 insertions, 4 deletions
diff --git a/lib/libfetch/common.c b/lib/libfetch/common.c index cb69ec0..4b2e6ea 100644 --- a/lib/libfetch/common.c +++ b/lib/libfetch/common.c @@ -271,8 +271,10 @@ _fetch_connect(const char *host, int port, int af, int verbose) return (NULL); } - if ((conn = _fetch_reopen(sd)) == NULL) + if ((conn = _fetch_reopen(sd)) == NULL) { + _fetch_syserr(); close(sd); + } return (conn); } diff --git a/lib/libfetch/ftp.c b/lib/libfetch/ftp.c index b08dd30..7897adf 100644 --- a/lib/libfetch/ftp.c +++ b/lib/libfetch/ftp.c @@ -796,10 +796,9 @@ _ftp_connect(struct url *url, struct url *purl, const char *flags) } /* check connection */ - if (conn == NULL) { - _fetch_syserr(); + if (conn == NULL) + /* _fetch_connect() has already set an error code */ return (NULL); - } /* expect welcome message */ if ((e = _ftp_chkerr(conn)) != FTP_SERVICE_READY) |
