diff options
author | des <des@FreeBSD.org> | 2007-12-14 10:26:58 +0000 |
---|---|---|
committer | des <des@FreeBSD.org> | 2007-12-14 10:26:58 +0000 |
commit | a1830118bafa4cb5662e20cb077d13f7a800d0f7 (patch) | |
tree | f8b313061d8f9a9fe0e8e1bbee4bf59f74f426cf /lib/libfetch/ftp.c | |
parent | 172a6bf06179f5675de365c7f2a22d25a9f9e53f (diff) | |
download | FreeBSD-src-a1830118bafa4cb5662e20cb077d13f7a800d0f7.zip FreeBSD-src-a1830118bafa4cb5662e20cb077d13f7a800d0f7.tar.gz |
Clean up namespace violations.
MFC after: 1 week
Diffstat (limited to 'lib/libfetch/ftp.c')
-rw-r--r-- | lib/libfetch/ftp.c | 232 |
1 files changed, 116 insertions, 116 deletions
diff --git a/lib/libfetch/ftp.c b/lib/libfetch/ftp.c index 3613c4c..5e4f7c3 100644 --- a/lib/libfetch/ftp.c +++ b/lib/libfetch/ftp.c @@ -135,16 +135,16 @@ unmappedaddr(struct sockaddr_in6 *sin6) * Get server response */ static int -_ftp_chkerr(conn_t *conn) +ftp_chkerr(conn_t *conn) { - if (_fetch_getln(conn) == -1) { - _fetch_syserr(); + if (fetch_getln(conn) == -1) { + fetch_syserr(); return (-1); } if (isftpinfo(conn->buf)) { while (conn->buflen && !isftpreply(conn->buf)) { - if (_fetch_getln(conn) == -1) { - _fetch_syserr(); + if (fetch_getln(conn) == -1) { + fetch_syserr(); return (-1); } } @@ -155,7 +155,7 @@ _ftp_chkerr(conn_t *conn) conn->buf[conn->buflen] = '\0'; if (!isftpreply(conn->buf)) { - _ftp_seterr(FTP_PROTOCOL_ERROR); + ftp_seterr(FTP_PROTOCOL_ERROR); return (-1); } @@ -170,7 +170,7 @@ _ftp_chkerr(conn_t *conn) * Send a command and check reply */ static int -_ftp_cmd(conn_t *conn, const char *fmt, ...) +ftp_cmd(conn_t *conn, const char *fmt, ...) { va_list ap; size_t len; @@ -183,26 +183,26 @@ _ftp_cmd(conn_t *conn, const char *fmt, ...) if (msg == NULL) { errno = ENOMEM; - _fetch_syserr(); + fetch_syserr(); return (-1); } - r = _fetch_putln(conn, msg, len); + r = fetch_putln(conn, msg, len); free(msg); if (r == -1) { - _fetch_syserr(); + fetch_syserr(); return (-1); } - return (_ftp_chkerr(conn)); + return (ftp_chkerr(conn)); } /* * Return a pointer to the filename part of a path */ static const char * -_ftp_filename(const char *file, int *len, int *type) +ftp_filename(const char *file, int *len, int *type) { const char *s; @@ -225,7 +225,7 @@ _ftp_filename(const char *file, int *len, int *type) * command. */ static int -_ftp_pwd(conn_t *conn, char *pwd, size_t pwdlen) +ftp_pwd(conn_t *conn, char *pwd, size_t pwdlen) { char *src, *dst, *end; int q; @@ -261,7 +261,7 @@ _ftp_pwd(conn_t *conn, char *pwd, size_t pwdlen) * file. */ static int -_ftp_cwd(conn_t *conn, const char *file) +ftp_cwd(conn_t *conn, const char *file) { const char *beg, *end; char pwd[PATH_MAX]; @@ -270,9 +270,9 @@ _ftp_cwd(conn_t *conn, const char *file) /* If no slashes in name, no need to change dirs. */ if ((end = strrchr(file, '/')) == NULL) return (0); - if ((e = _ftp_cmd(conn, "PWD")) != FTP_WORKING_DIRECTORY || - (e = _ftp_pwd(conn, pwd, sizeof(pwd))) != FTP_OK) { - _ftp_seterr(e); + if ((e = ftp_cmd(conn, "PWD")) != FTP_WORKING_DIRECTORY || + (e = ftp_pwd(conn, pwd, sizeof(pwd))) != FTP_OK) { + ftp_seterr(e); return (-1); } for (;;) { @@ -289,10 +289,10 @@ _ftp_cwd(conn_t *conn, const char *file) /* Keep going up a dir until we have a matching prefix. */ if (pwd[i] == '\0' && (file[i - 1] == '/' || file[i] == '/')) break; - if ((e = _ftp_cmd(conn, "CDUP")) != FTP_FILE_ACTION_OK || - (e = _ftp_cmd(conn, "PWD")) != FTP_WORKING_DIRECTORY || - (e = _ftp_pwd(conn, pwd, sizeof(pwd))) != FTP_OK) { - _ftp_seterr(e); + if ((e = ftp_cmd(conn, "CDUP")) != FTP_FILE_ACTION_OK || + (e = ftp_cmd(conn, "PWD")) != FTP_WORKING_DIRECTORY || + (e = ftp_pwd(conn, pwd, sizeof(pwd))) != FTP_OK) { + ftp_seterr(e); return (-1); } } @@ -307,7 +307,7 @@ _ftp_cwd(conn_t *conn, const char *file) return (0); /* Change to the directory all in one chunk (e.g., foo/bar/baz). */ - e = _ftp_cmd(conn, "CWD %.*s", (int)(end - beg), beg); + e = ftp_cmd(conn, "CWD %.*s", (int)(end - beg), beg); if (e == FTP_FILE_ACTION_OK) return (0); #endif /* FTP_COMBINE_CWDS */ @@ -318,9 +318,9 @@ _ftp_cwd(conn_t *conn, const char *file) ++beg, ++i; for (++i; file + i < end && file[i] != '/'; ++i) /* nothing */ ; - e = _ftp_cmd(conn, "CWD %.*s", file + i - beg, beg); + e = ftp_cmd(conn, "CWD %.*s", file + i - beg, beg); if (e != FTP_FILE_ACTION_OK) { - _ftp_seterr(e); + ftp_seterr(e); return (-1); } } @@ -331,7 +331,7 @@ _ftp_cwd(conn_t *conn, const char *file) * Set transfer mode and data type */ static int -_ftp_mode_type(conn_t *conn, int mode, int type) +ftp_mode_type(conn_t *conn, int mode, int type) { int e; @@ -344,7 +344,7 @@ _ftp_mode_type(conn_t *conn, int mode, int type) default: return (FTP_PROTOCOL_ERROR); } - if ((e = _ftp_cmd(conn, "MODE %c", mode)) != FTP_OK) { + if ((e = ftp_cmd(conn, "MODE %c", mode)) != FTP_OK) { if (mode == 'S') { /* * Stream mode is supposed to be the default - so @@ -380,7 +380,7 @@ _ftp_mode_type(conn_t *conn, int mode, int type) default: return (FTP_PROTOCOL_ERROR); } - if ((e = _ftp_cmd(conn, "TYPE %c", type)) != FTP_OK) + if ((e = ftp_cmd(conn, "TYPE %c", type)) != FTP_OK) return (e); return (FTP_OK); @@ -390,7 +390,7 @@ _ftp_mode_type(conn_t *conn, int mode, int type) * Request and parse file stats */ static int -_ftp_stat(conn_t *conn, const char *file, struct url_stat *us) +ftp_stat(conn_t *conn, const char *file, struct url_stat *us) { char *ln; const char *filename; @@ -402,16 +402,16 @@ _ftp_stat(conn_t *conn, const char *file, struct url_stat *us) us->size = -1; us->atime = us->mtime = 0; - filename = _ftp_filename(file, &filenamelen, &type); + filename = ftp_filename(file, &filenamelen, &type); - if ((e = _ftp_mode_type(conn, 0, type)) != FTP_OK) { - _ftp_seterr(e); + if ((e = ftp_mode_type(conn, 0, type)) != FTP_OK) { + ftp_seterr(e); return (-1); } - e = _ftp_cmd(conn, "SIZE %.*s", filenamelen, filename); + e = ftp_cmd(conn, "SIZE %.*s", filenamelen, filename); if (e != FTP_FILE_STATUS) { - _ftp_seterr(e); + ftp_seterr(e); return (-1); } for (ln = conn->buf + 4; *ln && isspace(*ln); ln++) @@ -419,7 +419,7 @@ _ftp_stat(conn_t *conn, const char *file, struct url_stat *us) for (us->size = 0; *ln && isdigit(*ln); ln++) us->size = us->size * 10 + *ln - '0'; if (*ln && !isspace(*ln)) { - _ftp_seterr(FTP_PROTOCOL_ERROR); + ftp_seterr(FTP_PROTOCOL_ERROR); us->size = -1; return (-1); } @@ -427,9 +427,9 @@ _ftp_stat(conn_t *conn, const char *file, struct url_stat *us) us->size = -1; DEBUG(fprintf(stderr, "size: [%lld]\n", (long long)us->size)); - e = _ftp_cmd(conn, "MDTM %.*s", filenamelen, filename); + e = ftp_cmd(conn, "MDTM %.*s", filenamelen, filename); if (e != FTP_FILE_STATUS) { - _ftp_seterr(e); + ftp_seterr(e); return (-1); } for (ln = conn->buf + 4; *ln && isspace(*ln); ln++) @@ -443,13 +443,13 @@ _ftp_stat(conn_t *conn, const char *file, struct url_stat *us) ln[1] = '0'; break; default: - _ftp_seterr(FTP_PROTOCOL_ERROR); + ftp_seterr(FTP_PROTOCOL_ERROR); return (-1); } if (sscanf(ln, "%04d%02d%02d%02d%02d%02d", &tm.tm_year, &tm.tm_mon, &tm.tm_mday, &tm.tm_hour, &tm.tm_min, &tm.tm_sec) != 6) { - _ftp_seterr(FTP_PROTOCOL_ERROR); + ftp_seterr(FTP_PROTOCOL_ERROR); return (-1); } tm.tm_mon--; @@ -478,13 +478,13 @@ struct ftpio { int err; /* Error code */ }; -static int _ftp_readfn(void *, char *, int); -static int _ftp_writefn(void *, const char *, int); -static fpos_t _ftp_seekfn(void *, fpos_t, int); -static int _ftp_closefn(void *); +static int ftp_readfn(void *, char *, int); +static int ftp_writefn(void *, const char *, int); +static fpos_t ftp_seekfn(void *, fpos_t, int); +static int ftp_closefn(void *); static int -_ftp_readfn(void *v, char *buf, int len) +ftp_readfn(void *v, char *buf, int len) { struct ftpio *io; int r; @@ -504,7 +504,7 @@ _ftp_readfn(void *v, char *buf, int len) } if (io->eof) return (0); - r = _fetch_read(io->dconn, buf, len); + r = fetch_read(io->dconn, buf, len); if (r > 0) return (r); if (r == 0) { @@ -517,7 +517,7 @@ _ftp_readfn(void *v, char *buf, int len) } static int -_ftp_writefn(void *v, const char *buf, int len) +ftp_writefn(void *v, const char *buf, int len) { struct ftpio *io; int w; @@ -535,7 +535,7 @@ _ftp_writefn(void *v, const char *buf, int len) errno = io->err; return (-1); } - w = _fetch_write(io->dconn, buf, len); + w = fetch_write(io->dconn, buf, len); if (w >= 0) return (w); if (errno != EINTR) @@ -544,7 +544,7 @@ _ftp_writefn(void *v, const char *buf, int len) } static fpos_t -_ftp_seekfn(void *v, fpos_t pos __unused, int whence __unused) +ftp_seekfn(void *v, fpos_t pos __unused, int whence __unused) { struct ftpio *io; @@ -558,7 +558,7 @@ _ftp_seekfn(void *v, fpos_t pos __unused, int whence __unused) } static int -_ftp_closefn(void *v) +ftp_closefn(void *v) { struct ftpio *io; int r; @@ -574,20 +574,20 @@ _ftp_closefn(void *v) errno = EBADF; return (-1); } - _fetch_close(io->dconn); + fetch_close(io->dconn); io->dir = -1; io->dconn = NULL; DEBUG(fprintf(stderr, "Waiting for final status\n")); - r = _ftp_chkerr(io->cconn); + r = ftp_chkerr(io->cconn); if (io->cconn == cached_connection && io->cconn->ref == 1) cached_connection = NULL; - _fetch_close(io->cconn); + fetch_close(io->cconn); free(io); return (r == FTP_TRANSFER_COMPLETE) ? 0 : -1; } static FILE * -_ftp_setup(conn_t *cconn, conn_t *dconn, int mode) +ftp_setup(conn_t *cconn, conn_t *dconn, int mode) { struct ftpio *io; FILE *f; @@ -600,7 +600,7 @@ _ftp_setup(conn_t *cconn, conn_t *dconn, int mode) io->dconn = dconn; io->dir = mode; io->eof = io->err = 0; - f = funopen(io, _ftp_readfn, _ftp_writefn, _ftp_seekfn, _ftp_closefn); + f = funopen(io, ftp_readfn, ftp_writefn, ftp_seekfn, ftp_closefn); if (f == NULL) free(io); return (f); @@ -610,7 +610,7 @@ _ftp_setup(conn_t *cconn, conn_t *dconn, int mode) * Transfer file */ static FILE * -_ftp_transfer(conn_t *conn, const char *oper, const char *file, +ftp_transfer(conn_t *conn, const char *oper, const char *file, int mode, off_t offset, const char *flags) { struct sockaddr_storage sa; @@ -636,10 +636,10 @@ _ftp_transfer(conn_t *conn, const char *oper, const char *file, strncasecmp(s, "no", 2) != 0); /* isolate filename */ - filename = _ftp_filename(file, &filenamelen, &type); + filename = ftp_filename(file, &filenamelen, &type); /* set transfer mode and data type */ - if ((e = _ftp_mode_type(conn, 0, type)) != FTP_OK) + if ((e = ftp_mode_type(conn, 0, type)) != FTP_OK) goto ouch; /* find our own address, bind, and listen */ @@ -651,7 +651,7 @@ _ftp_transfer(conn_t *conn, const char *oper, const char *file, /* open data socket */ if ((sd = socket(sa.ss_family, SOCK_STREAM, IPPROTO_TCP)) == -1) { - _fetch_syserr(); + fetch_syserr(); return (NULL); } @@ -663,17 +663,17 @@ _ftp_transfer(conn_t *conn, const char *oper, const char *file, /* send PASV command */ if (verbose) - _fetch_info("setting passive mode"); + fetch_info("setting passive mode"); switch (sa.ss_family) { case AF_INET: - if ((e = _ftp_cmd(conn, "PASV")) != FTP_PASSIVE_MODE) + if ((e = ftp_cmd(conn, "PASV")) != FTP_PASSIVE_MODE) goto ouch; break; case AF_INET6: - if ((e = _ftp_cmd(conn, "EPSV")) != FTP_EPASSIVE_MODE) { + if ((e = ftp_cmd(conn, "EPSV")) != FTP_EPASSIVE_MODE) { if (e == -1) goto ouch; - if ((e = _ftp_cmd(conn, "LPSV")) != + if ((e = ftp_cmd(conn, "LPSV")) != FTP_LPASSIVE_MODE) goto ouch; } @@ -725,7 +725,7 @@ _ftp_transfer(conn_t *conn, const char *oper, const char *file, /* seek to required offset */ if (offset) - if (_ftp_cmd(conn, "REST %lu", (u_long)offset) != FTP_FILE_OK) + if (ftp_cmd(conn, "REST %lu", (u_long)offset) != FTP_FILE_OK) goto sysouch; /* construct sockaddr for data socket */ @@ -760,18 +760,18 @@ _ftp_transfer(conn_t *conn, const char *oper, const char *file, /* connect to data port */ if (verbose) - _fetch_info("opening data connection"); + fetch_info("opening data connection"); bindaddr = getenv("FETCH_BIND_ADDRESS"); if (bindaddr != NULL && *bindaddr != '\0' && - _fetch_bind(sd, sa.ss_family, bindaddr) != 0) + fetch_bind(sd, sa.ss_family, bindaddr) != 0) goto sysouch; if (connect(sd, (struct sockaddr *)&sa, sa.ss_len) == -1) goto sysouch; /* make the server initiate the transfer */ if (verbose) - _fetch_info("initiating transfer"); - e = _ftp_cmd(conn, "%s %.*s", oper, filenamelen, filename); + fetch_info("initiating transfer"); + e = ftp_cmd(conn, "%s %.*s", oper, filenamelen, filename); if (e != FTP_CONNECTION_ALREADY_OPEN && e != FTP_OPEN_DATA_CONNECTION) goto ouch; @@ -801,7 +801,7 @@ _ftp_transfer(conn_t *conn, const char *oper, const char *file, break; } if (verbose) - _fetch_info("binding data socket"); + fetch_info("binding data socket"); if (bind(sd, (struct sockaddr *)&sa, sa.ss_len) == -1) goto sysouch; if (listen(sd, 1) == -1) @@ -815,7 +815,7 @@ _ftp_transfer(conn_t *conn, const char *oper, const char *file, sin4 = (struct sockaddr_in *)&sa; a = ntohl(sin4->sin_addr.s_addr); p = ntohs(sin4->sin_port); - e = _ftp_cmd(conn, "PORT %d,%d,%d,%d,%d,%d", + e = ftp_cmd(conn, "PORT %d,%d,%d,%d,%d,%d", (a >> 24) & 0xff, (a >> 16) & 0xff, (a >> 8) & 0xff, a & 0xff, (p >> 8) & 0xff, p & 0xff); @@ -828,14 +828,14 @@ _ftp_transfer(conn_t *conn, const char *oper, const char *file, if (getnameinfo((struct sockaddr *)&sa, sa.ss_len, hname, sizeof(hname), NULL, 0, NI_NUMERICHOST) == 0) { - e = _ftp_cmd(conn, "EPRT |%d|%s|%d|", 2, hname, + e = ftp_cmd(conn, "EPRT |%d|%s|%d|", 2, hname, htons(sin6->sin6_port)); if (e == -1) goto ouch; } if (e != FTP_OK) { ap = (char *)&sin6->sin6_addr; - e = _ftp_cmd(conn, + e = ftp_cmd(conn, "LPRT %d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d", 6, 16, UC(ap[0]), UC(ap[1]), UC(ap[2]), UC(ap[3]), @@ -856,13 +856,13 @@ _ftp_transfer(conn_t *conn, const char *oper, const char *file, /* seek to required offset */ if (offset) - if (_ftp_cmd(conn, "REST %ju", (uintmax_t)offset) != FTP_FILE_OK) + if (ftp_cmd(conn, "REST %ju", (uintmax_t)offset) != FTP_FILE_OK) goto sysouch; /* make the server initiate the transfer */ if (verbose) - _fetch_info("initiating transfer"); - e = _ftp_cmd(conn, "%s %.*s", oper, filenamelen, filename); + fetch_info("initiating transfer"); + e = ftp_cmd(conn, "%s %.*s", oper, filenamelen, filename); if (e != FTP_CONNECTION_ALREADY_OPEN && e != FTP_OPEN_DATA_CONNECTION) goto ouch; @@ -873,19 +873,19 @@ _ftp_transfer(conn_t *conn, const char *oper, const char *file, sd = d; } - if ((df = _ftp_setup(conn, _fetch_reopen(sd), mode)) == NULL) + if ((df = ftp_setup(conn, fetch_reopen(sd), mode)) == NULL) goto sysouch; return (df); sysouch: - _fetch_syserr(); + fetch_syserr(); if (sd >= 0) close(sd); return (NULL); ouch: if (e != -1) - _ftp_seterr(e); + ftp_seterr(e); if (sd >= 0) close(sd); return (NULL); @@ -895,7 +895,7 @@ ouch: * Authenticate */ static int -_ftp_authenticate(conn_t *conn, struct url *url, struct url *purl) +ftp_authenticate(conn_t *conn, struct url *url, struct url *purl) { const char *user, *pwd, *logname; char pbuf[MAXHOSTNAMELEN + MAXLOGNAME + 1]; @@ -905,18 +905,18 @@ _ftp_authenticate(conn_t *conn, struct url *url, struct url *purl) /* send user name and password */ if (url->user[0] == '\0') - _fetch_netrc_auth(url); + fetch_netrc_auth(url); user = url->user; if (*user == '\0') user = getenv("FTP_LOGIN"); if (user == NULL || *user == '\0') user = FTP_ANONYMOUS_USER; - if (purl && url->port == _fetch_default_port(url->scheme)) - e = _ftp_cmd(conn, "USER %s@%s", user, url->host); + if (purl && url->port == fetch_default_port(url->scheme)) + e = ftp_cmd(conn, "USER %s@%s", user, url->host); else if (purl) - e = _ftp_cmd(conn, "USER %s@%s@%d", user, url->host, url->port); + e = ftp_cmd(conn, "USER %s@%s@%d", user, url->host, url->port); else - e = _ftp_cmd(conn, "USER %s", user); + e = ftp_cmd(conn, "USER %s", user); /* did the server request a password? */ if (e == FTP_NEED_PASSWORD) { @@ -933,7 +933,7 @@ _ftp_authenticate(conn_t *conn, struct url *url, struct url *purl) gethostname(pbuf + len, sizeof(pbuf) - len); pwd = pbuf; } - e = _ftp_cmd(conn, "PASS %s", pwd); + e = ftp_cmd(conn, "PASS %s", pwd); } return (e); @@ -943,7 +943,7 @@ _ftp_authenticate(conn_t *conn, struct url *url, struct url *purl) * Log on to FTP server */ static conn_t * -_ftp_connect(struct url *url, struct url *purl, const char *flags) +ftp_connect(struct url *url, struct url *purl, const char *flags) { conn_t *conn; int e, direct, verbose; @@ -966,24 +966,24 @@ _ftp_connect(struct url *url, struct url *purl, const char *flags) /* check for proxy */ if (purl) { /* XXX proxy authentication! */ - conn = _fetch_connect(purl->host, purl->port, af, verbose); + conn = fetch_connect(purl->host, purl->port, af, verbose); } else { /* no proxy, go straight to target */ - conn = _fetch_connect(url->host, url->port, af, verbose); + conn = fetch_connect(url->host, url->port, af, verbose); purl = NULL; } /* check connection */ if (conn == NULL) - /* _fetch_connect() has already set an error code */ + /* fetch_connect() has already set an error code */ return (NULL); /* expect welcome message */ - if ((e = _ftp_chkerr(conn)) != FTP_SERVICE_READY) + if ((e = ftp_chkerr(conn)) != FTP_SERVICE_READY) goto fouch; /* authenticate */ - if ((e = _ftp_authenticate(conn, url, purl)) != FTP_LOGGED_IN) + if ((e = ftp_authenticate(conn, url, purl)) != FTP_LOGGED_IN) goto fouch; /* TODO: Request extended features supported, if any (RFC 3659). */ @@ -993,8 +993,8 @@ _ftp_connect(struct url *url, struct url *purl, const char *flags) fouch: if (e != -1) - _ftp_seterr(e); - _fetch_close(conn); + ftp_seterr(e); + fetch_close(conn); return (NULL); } @@ -1002,19 +1002,19 @@ fouch: * Disconnect from server */ static void -_ftp_disconnect(conn_t *conn) +ftp_disconnect(conn_t *conn) { - (void)_ftp_cmd(conn, "QUIT"); + (void)ftp_cmd(conn, "QUIT"); if (conn == cached_connection && conn->ref == 1) cached_connection = NULL; - _fetch_close(conn); + fetch_close(conn); } /* * Check if we're already connected */ static int -_ftp_isconnected(struct url *url) +ftp_isconnected(struct url *url) { return (cached_connection && (strcmp(url->host, cached_host.host) == 0) @@ -1027,28 +1027,28 @@ _ftp_isconnected(struct url *url) * Check the cache, reconnect if no luck */ static conn_t * -_ftp_cached_connect(struct url *url, struct url *purl, const char *flags) +ftp_cached_connect(struct url *url, struct url *purl, const char *flags) { conn_t *conn; int e; /* set default port */ if (!url->port) - url->port = _fetch_default_port(url->scheme); + url->port = fetch_default_port(url->scheme); /* try to use previously cached connection */ - if (_ftp_isconnected(url)) { - e = _ftp_cmd(cached_connection, "NOOP"); + if (ftp_isconnected(url)) { + e = ftp_cmd(cached_connection, "NOOP"); if (e == FTP_OK || e == FTP_SYNTAX_ERROR) - return (_fetch_ref(cached_connection)); + return (fetch_ref(cached_connection)); } /* connect to server */ - if ((conn = _ftp_connect(url, purl, flags)) == NULL) + if ((conn = ftp_connect(url, purl, flags)) == NULL) return (NULL); if (cached_connection) - _ftp_disconnect(cached_connection); - cached_connection = _fetch_ref(conn); + ftp_disconnect(cached_connection); + cached_connection = fetch_ref(conn); memcpy(&cached_host, url, sizeof(*url)); return (conn); } @@ -1057,7 +1057,7 @@ _ftp_cached_connect(struct url *url, struct url *purl, const char *flags) * Check the proxy settings */ static struct url * -_ftp_get_proxy(const char *flags) +ftp_get_proxy(const char *flags) { struct url *purl; char *p; @@ -1074,7 +1074,7 @@ _ftp_get_proxy(const char *flags) strcpy(purl->scheme, SCHEME_HTTP); } if (!purl->port) - purl->port = _fetch_default_proxy_port(purl->scheme); + purl->port = fetch_default_proxy_port(purl->scheme); if (strcasecmp(purl->scheme, SCHEME_FTP) == 0 || strcasecmp(purl->scheme, SCHEME_HTTP) == 0) return (purl); @@ -1087,7 +1087,7 @@ _ftp_get_proxy(const char *flags) * Process an FTP request */ FILE * -_ftp_request(struct url *url, const char *op, struct url_stat *us, +ftp_request(struct url *url, const char *op, struct url_stat *us, struct url *purl, const char *flags) { conn_t *conn; @@ -1096,9 +1096,9 @@ _ftp_request(struct url *url, const char *op, struct url_stat *us, /* check if we should use HTTP instead */ if (purl && strcasecmp(purl->scheme, SCHEME_HTTP) == 0) { if (strcmp(op, "STAT") == 0) - return (_http_request(url, "HEAD", us, purl, flags)); + return (http_request(url, "HEAD", us, purl, flags)); else if (strcmp(op, "RETR") == 0) - return (_http_request(url, "GET", us, purl, flags)); + return (http_request(url, "GET", us, purl, flags)); /* * Our HTTP code doesn't support PUT requests yet, so try * a direct connection. @@ -1106,18 +1106,18 @@ _ftp_request(struct url *url, const char *op, struct url_stat *us, } /* connect to server */ - conn = _ftp_cached_connect(url, purl, flags); + conn = ftp_cached_connect(url, purl, flags); if (purl) fetchFreeURL(purl); if (conn == NULL) return (NULL); /* change directory */ - if (_ftp_cwd(conn, url->doc) == -1) + if (ftp_cwd(conn, url->doc) == -1) return (NULL); /* stat file */ - if (us && _ftp_stat(conn, url->doc, us) == -1 + if (us && ftp_stat(conn, url->doc, us) == -1 && fetchLastErrCode != FETCH_PROTO && fetchLastErrCode != FETCH_UNAVAIL) return (NULL); @@ -1131,7 +1131,7 @@ _ftp_request(struct url *url, const char *op, struct url_stat *us, oflag = O_RDONLY; /* initiate the transfer */ - return (_ftp_transfer(conn, op, url->doc, oflag, url->offset, flags)); + return (ftp_transfer(conn, op, url->doc, oflag, url->offset, flags)); } /* @@ -1140,7 +1140,7 @@ _ftp_request(struct url *url, const char *op, struct url_stat *us, FILE * fetchXGetFTP(struct url *url, struct url_stat *us, const char *flags) { - return (_ftp_request(url, "RETR", us, _ftp_get_proxy(flags), flags)); + return (ftp_request(url, "RETR", us, ftp_get_proxy(flags), flags)); } /* @@ -1159,8 +1159,8 @@ FILE * fetchPutFTP(struct url *url, const char *flags) { - return (_ftp_request(url, CHECK_FLAG('a') ? "APPE" : "STOR", NULL, - _ftp_get_proxy(flags), flags)); + return (ftp_request(url, CHECK_FLAG('a') ? "APPE" : "STOR", NULL, + ftp_get_proxy(flags), flags)); } /* @@ -1171,7 +1171,7 @@ fetchStatFTP(struct url *url, struct url_stat *us, const char *flags) { FILE *f; - f = _ftp_request(url, "STAT", us, _ftp_get_proxy(flags), flags); + f = ftp_request(url, "STAT", us, ftp_get_proxy(flags), flags); if (f == NULL) return (-1); return (0); |