1998-07-09 16:52:44 +00:00
|
|
|
|
/*-
|
|
|
|
|
* Copyright (c) 1998 Dag-Erling Co<EFBFBD>dan Sm<EFBFBD>rgrav
|
|
|
|
|
* All rights reserved.
|
|
|
|
|
*
|
|
|
|
|
* Redistribution and use in source and binary forms, with or without
|
|
|
|
|
* modification, are permitted provided that the following conditions
|
|
|
|
|
* are met:
|
|
|
|
|
* 1. Redistributions of source code must retain the above copyright
|
|
|
|
|
* notice, this list of conditions and the following disclaimer
|
|
|
|
|
* in this position and unchanged.
|
|
|
|
|
* 2. Redistributions in binary form must reproduce the above copyright
|
|
|
|
|
* notice, this list of conditions and the following disclaimer in the
|
|
|
|
|
* documentation and/or other materials provided with the distribution.
|
|
|
|
|
* 3. The name of the author may not be used to endorse or promote products
|
|
|
|
|
* derived from this software without specific prior written permission
|
|
|
|
|
*
|
|
|
|
|
* THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
|
|
|
|
|
* IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
|
|
|
|
|
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
|
|
|
|
|
* IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
|
|
|
|
|
* INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
|
|
|
|
|
* NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
|
|
|
|
|
* DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
|
|
|
|
|
* THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
|
|
|
|
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
|
|
|
|
|
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
|
|
|
|
*
|
1999-08-28 00:22:10 +00:00
|
|
|
|
* $FreeBSD$
|
1998-07-09 16:52:44 +00:00
|
|
|
|
*/
|
|
|
|
|
|
|
|
|
|
/*
|
1998-07-11 18:56:01 +00:00
|
|
|
|
* Portions of this code were taken from or based on ftpio.c:
|
1998-07-09 16:52:44 +00:00
|
|
|
|
*
|
|
|
|
|
* ----------------------------------------------------------------------------
|
|
|
|
|
* "THE BEER-WARE LICENSE" (Revision 42):
|
|
|
|
|
* <phk@login.dknet.dk> wrote this file. As long as you retain this notice you
|
|
|
|
|
* can do whatever you want with this stuff. If we meet some day, and you think
|
|
|
|
|
* this stuff is worth it, you can buy me a beer in return. Poul-Henning Kamp
|
|
|
|
|
* ----------------------------------------------------------------------------
|
|
|
|
|
*
|
|
|
|
|
* Major Changelog:
|
|
|
|
|
*
|
|
|
|
|
* Dag-Erling Co<EFBFBD>dan Sm<EFBFBD>rgrav
|
|
|
|
|
* 9 Jun 1998
|
|
|
|
|
*
|
|
|
|
|
* Incorporated into libfetch
|
|
|
|
|
*
|
|
|
|
|
* Jordan K. Hubbard
|
|
|
|
|
* 17 Jan 1996
|
|
|
|
|
*
|
|
|
|
|
* Turned inside out. Now returns xfers as new file ids, not as a special
|
|
|
|
|
* `state' of FTP_t
|
|
|
|
|
*
|
|
|
|
|
* $ftpioId: ftpio.c,v 1.30 1998/04/11 07:28:53 phk Exp $
|
|
|
|
|
*
|
|
|
|
|
*/
|
|
|
|
|
|
1998-12-16 10:24:55 +00:00
|
|
|
|
#include <sys/param.h>
|
1998-07-09 16:52:44 +00:00
|
|
|
|
#include <sys/socket.h>
|
|
|
|
|
#include <netinet/in.h>
|
|
|
|
|
|
|
|
|
|
#include <ctype.h>
|
2000-01-07 12:58:40 +00:00
|
|
|
|
#include <errno.h>
|
2000-05-07 20:00:12 +00:00
|
|
|
|
#include <netdb.h>
|
1998-07-11 21:29:08 +00:00
|
|
|
|
#include <stdarg.h>
|
1998-07-09 16:52:44 +00:00
|
|
|
|
#include <stdio.h>
|
1998-07-11 18:56:01 +00:00
|
|
|
|
#include <stdlib.h>
|
1998-07-09 16:52:44 +00:00
|
|
|
|
#include <string.h>
|
1998-12-16 15:29:03 +00:00
|
|
|
|
#include <time.h>
|
1998-07-11 18:56:01 +00:00
|
|
|
|
#include <unistd.h>
|
1998-07-09 16:52:44 +00:00
|
|
|
|
|
|
|
|
|
#include "fetch.h"
|
1998-11-05 19:48:17 +00:00
|
|
|
|
#include "common.h"
|
1998-12-16 10:24:55 +00:00
|
|
|
|
#include "ftperr.h"
|
1998-07-09 16:52:44 +00:00
|
|
|
|
|
|
|
|
|
#define FTP_ANONYMOUS_USER "ftp"
|
|
|
|
|
#define FTP_ANONYMOUS_PASSWORD "ftp"
|
1998-07-11 21:29:08 +00:00
|
|
|
|
|
2000-08-21 07:18:31 +00:00
|
|
|
|
#define FTP_CONNECTION_ALREADY_OPEN 125
|
1998-07-11 21:29:08 +00:00
|
|
|
|
#define FTP_OPEN_DATA_CONNECTION 150
|
|
|
|
|
#define FTP_OK 200
|
1998-12-16 15:29:03 +00:00
|
|
|
|
#define FTP_FILE_STATUS 213
|
1998-12-16 11:44:31 +00:00
|
|
|
|
#define FTP_SERVICE_READY 220
|
1998-07-11 21:29:08 +00:00
|
|
|
|
#define FTP_PASSIVE_MODE 227
|
2000-05-20 18:23:51 +00:00
|
|
|
|
#define FTP_LPASSIVE_MODE 228
|
|
|
|
|
#define FTP_EPASSIVE_MODE 229
|
1998-07-11 21:29:08 +00:00
|
|
|
|
#define FTP_LOGGED_IN 230
|
|
|
|
|
#define FTP_FILE_ACTION_OK 250
|
|
|
|
|
#define FTP_NEED_PASSWORD 331
|
|
|
|
|
#define FTP_NEED_ACCOUNT 332
|
2000-05-07 20:00:12 +00:00
|
|
|
|
#define FTP_FILE_OK 350
|
2000-01-07 12:58:40 +00:00
|
|
|
|
#define FTP_SYNTAX_ERROR 500
|
2000-07-17 21:00:49 +00:00
|
|
|
|
#define FTP_PROTOCOL_ERROR 999
|
1998-07-09 16:52:44 +00:00
|
|
|
|
|
Second of a series of cleanups to libfetch.
This commit introduces the following features:
a) the fetchStat*() functions, which return meta-information for a
document, such as size, modification time, etc.
b) the use of the com_err(3) facilities to report errors.
It also fixes a bunch of style bugs and a few logic bugs and somewhat
improves the man page.
Changed files, in alphabetical order:
Makefile:
Don't generate macros in {ftp,http}err.c.
Generate category fields for the error message lists.
Compile the error table.
Install fetch_err.h along with fetch.h.
common.c:
Remove the _netdb_errstring() macro, and add FETCH_ERR_NETDB to the
error code in the _netdb_seterr() macro.
Add categories to the _netdb_errlist table.
Report errors through the Common Error library.
common.h:
Add the DEBUG macros.
Add prototype for fetchConnect().
Remove the prototype for _fetch_errstring(), which is local to common.c
Add a categroy field to struct fetcherr, and define constants for
error categories.
Define macros for _{url,netdb,ftp,http}_seterr().
errors.et: (new file)
List error categories.
fetch.3:
Document the fetchStat*() functions.
Move the "unimplemented functionality" comments from NOTES to BUGS.
Document that applications which use libfetch must also use
libcom_err, and list existing error codes.
Undocument fetchLastErr{Code,String}.
Remove the (empty) DIAGNOSTICS section.
Mention Eugene Skepner in the AUTHORS section.
fetch.c:
Move the DEBUG macros to common.c
Add fetchStat() and fetchStatURL().
Generate error messages for URL parser errors, and fix a minor bug
in the parser.
Use 'struct url' instead of 'url_t'.
Remove fetchLastErr{Code,String}.
fetch.h:
Use 'struct url' instead of 'url_t', and remove the typedef.
Define struct url_stat (used by fetchStat()).
Add prototypes for fetchStat*().
Remove the declarations for fetchLastErr{Code,String}.
Include fetch_err.h.
fetch_err.et: (new file)
Error table for libfetch.
file.c:
Add fetchStatFile().
Use 'struct url' instead of 'url_t'.
ftp.c:
Add fetchStatFTP().
Use 'struct url' instead of 'url_t'.
Don't use fetchLastErrCode.
ftp.errors:
Add categories to all error messages.
http.c:
Add fetchStatHTTP().
Use 'struct url' instead of 'url_t'.
Don't use fetchLastErr{Code,Text}.
http.errors:
Add categories to all error messages.
Prompted by: jkh and Eugene Skepner
Numerous sugestions from: Garett Wollman and Eugene Skepner
1998-11-06 22:14:08 +00:00
|
|
|
|
static struct url cached_host;
|
2000-01-07 12:58:40 +00:00
|
|
|
|
static int cached_socket;
|
1998-07-09 16:52:44 +00:00
|
|
|
|
|
2000-01-07 12:58:40 +00:00
|
|
|
|
static char *last_reply;
|
|
|
|
|
static size_t lr_size, lr_length;
|
|
|
|
|
static int last_code;
|
|
|
|
|
|
|
|
|
|
#define isftpreply(foo) (isdigit(foo[0]) && isdigit(foo[1]) \
|
2000-05-19 09:45:42 +00:00
|
|
|
|
&& isdigit(foo[2]) \
|
|
|
|
|
&& (foo[3] == ' ' || foo[3] == '\0'))
|
2000-01-07 12:58:40 +00:00
|
|
|
|
#define isftpinfo(foo) (isdigit(foo[0]) && isdigit(foo[1]) \
|
|
|
|
|
&& isdigit(foo[2]) && foo[3] == '-')
|
1998-07-11 18:56:01 +00:00
|
|
|
|
|
2000-05-20 18:23:51 +00:00
|
|
|
|
/* translate IPv4 mapped IPv6 address to IPv4 address */
|
|
|
|
|
static void
|
|
|
|
|
unmappedaddr(struct sockaddr_in6 *sin6)
|
|
|
|
|
{
|
|
|
|
|
struct sockaddr_in *sin4;
|
|
|
|
|
u_int32_t addr;
|
|
|
|
|
int port;
|
|
|
|
|
|
|
|
|
|
if (sin6->sin6_family != AF_INET6 ||
|
|
|
|
|
!IN6_IS_ADDR_V4MAPPED(&sin6->sin6_addr))
|
|
|
|
|
return;
|
|
|
|
|
sin4 = (struct sockaddr_in *)sin6;
|
|
|
|
|
addr = *(u_int32_t *)&sin6->sin6_addr.s6_addr[12];
|
|
|
|
|
port = sin6->sin6_port;
|
|
|
|
|
memset(sin4, 0, sizeof(struct sockaddr_in));
|
|
|
|
|
sin4->sin_addr.s_addr = addr;
|
|
|
|
|
sin4->sin_port = port;
|
|
|
|
|
sin4->sin_family = AF_INET;
|
|
|
|
|
sin4->sin_len = sizeof(struct sockaddr_in);
|
|
|
|
|
}
|
|
|
|
|
|
1998-07-09 16:52:44 +00:00
|
|
|
|
/*
|
2000-01-07 12:58:40 +00:00
|
|
|
|
* Get server response
|
1998-07-09 16:52:44 +00:00
|
|
|
|
*/
|
|
|
|
|
static int
|
2000-01-07 12:58:40 +00:00
|
|
|
|
_ftp_chkerr(int cd)
|
1998-07-09 16:52:44 +00:00
|
|
|
|
{
|
2000-06-28 15:48:26 +00:00
|
|
|
|
if (_fetch_getln(cd, &last_reply, &lr_size, &lr_length) == -1) {
|
|
|
|
|
_fetch_syserr();
|
|
|
|
|
return -1;
|
|
|
|
|
}
|
|
|
|
|
if (isftpinfo(last_reply)) {
|
|
|
|
|
while (!isftpreply(last_reply)) {
|
|
|
|
|
if (_fetch_getln(cd, &last_reply, &lr_size, &lr_length) == -1) {
|
|
|
|
|
_fetch_syserr();
|
|
|
|
|
return -1;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
2000-01-07 12:58:40 +00:00
|
|
|
|
|
|
|
|
|
while (lr_length && isspace(last_reply[lr_length-1]))
|
|
|
|
|
lr_length--;
|
|
|
|
|
last_reply[lr_length] = 0;
|
1998-07-09 16:52:44 +00:00
|
|
|
|
|
2000-01-07 12:58:40 +00:00
|
|
|
|
if (!isftpreply(last_reply)) {
|
2000-07-17 21:00:49 +00:00
|
|
|
|
_ftp_seterr(FTP_PROTOCOL_ERROR);
|
1998-07-09 16:52:44 +00:00
|
|
|
|
return -1;
|
1998-07-11 18:56:01 +00:00
|
|
|
|
}
|
1998-07-09 16:52:44 +00:00
|
|
|
|
|
2000-01-07 12:58:40 +00:00
|
|
|
|
last_code = (last_reply[0] - '0') * 100
|
|
|
|
|
+ (last_reply[1] - '0') * 10
|
|
|
|
|
+ (last_reply[2] - '0');
|
|
|
|
|
|
|
|
|
|
return last_code;
|
1998-07-09 16:52:44 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/*
|
1998-07-11 21:29:08 +00:00
|
|
|
|
* Send a command and check reply
|
1998-07-09 16:52:44 +00:00
|
|
|
|
*/
|
|
|
|
|
static int
|
2000-01-07 12:58:40 +00:00
|
|
|
|
_ftp_cmd(int cd, char *fmt, ...)
|
1998-07-09 16:52:44 +00:00
|
|
|
|
{
|
1998-07-11 21:29:08 +00:00
|
|
|
|
va_list ap;
|
2000-07-11 23:50:22 +00:00
|
|
|
|
size_t len;
|
2000-01-07 12:58:40 +00:00
|
|
|
|
char *msg;
|
|
|
|
|
int r;
|
1998-07-11 21:29:08 +00:00
|
|
|
|
|
|
|
|
|
va_start(ap, fmt);
|
2000-07-11 23:50:22 +00:00
|
|
|
|
len = vasprintf(&msg, fmt, ap);
|
2000-01-07 12:58:40 +00:00
|
|
|
|
va_end(ap);
|
|
|
|
|
|
|
|
|
|
if (msg == NULL) {
|
|
|
|
|
errno = ENOMEM;
|
|
|
|
|
_fetch_syserr();
|
|
|
|
|
return -1;
|
|
|
|
|
}
|
2000-07-11 23:50:22 +00:00
|
|
|
|
|
|
|
|
|
r = _fetch_putln(cd, msg, len);
|
2000-01-07 12:58:40 +00:00
|
|
|
|
free(msg);
|
2000-07-11 23:50:22 +00:00
|
|
|
|
|
2000-01-07 12:58:40 +00:00
|
|
|
|
if (r == -1) {
|
|
|
|
|
_fetch_syserr();
|
|
|
|
|
return -1;
|
|
|
|
|
}
|
1998-07-11 18:56:01 +00:00
|
|
|
|
|
2000-01-07 12:58:40 +00:00
|
|
|
|
return _ftp_chkerr(cd);
|
1998-07-09 16:52:44 +00:00
|
|
|
|
}
|
|
|
|
|
|
2000-07-17 21:25:00 +00:00
|
|
|
|
/*
|
|
|
|
|
* Return a pointer to the filename part of a path
|
|
|
|
|
*/
|
|
|
|
|
static char *
|
|
|
|
|
_ftp_filename(char *file)
|
|
|
|
|
{
|
|
|
|
|
char *s;
|
|
|
|
|
|
|
|
|
|
if ((s = strrchr(file, '/')) == NULL)
|
|
|
|
|
return file;
|
|
|
|
|
else
|
|
|
|
|
return s + 1;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
|
* Change working directory to the directory that contains the
|
|
|
|
|
* specified file.
|
|
|
|
|
*/
|
|
|
|
|
static int
|
|
|
|
|
_ftp_cwd(int cd, char *file)
|
|
|
|
|
{
|
|
|
|
|
char *s;
|
|
|
|
|
int e;
|
|
|
|
|
|
2000-07-20 02:03:56 +00:00
|
|
|
|
if ((s = strrchr(file, '/')) == NULL || s == file) {
|
2000-07-17 21:25:00 +00:00
|
|
|
|
e = _ftp_cmd(cd, "CWD /");
|
|
|
|
|
} else {
|
|
|
|
|
e = _ftp_cmd(cd, "CWD %.*s", s - file, file);
|
|
|
|
|
}
|
|
|
|
|
if (e != FTP_FILE_ACTION_OK) {
|
|
|
|
|
_ftp_seterr(e);
|
|
|
|
|
return -1;
|
|
|
|
|
}
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
|
* Request and parse file stats
|
|
|
|
|
*/
|
|
|
|
|
static int
|
|
|
|
|
_ftp_stat(int cd, char *file, struct url_stat *us)
|
|
|
|
|
{
|
|
|
|
|
char *ln, *s;
|
|
|
|
|
struct tm tm;
|
|
|
|
|
time_t t;
|
|
|
|
|
int e;
|
|
|
|
|
|
2000-07-18 07:12:26 +00:00
|
|
|
|
us->size = -1;
|
|
|
|
|
us->atime = us->mtime = 0;
|
|
|
|
|
|
2000-07-17 21:25:00 +00:00
|
|
|
|
if ((s = strrchr(file, '/')) == NULL)
|
|
|
|
|
s = file;
|
|
|
|
|
else
|
|
|
|
|
++s;
|
|
|
|
|
|
|
|
|
|
if ((e = _ftp_cmd(cd, "SIZE %s", s)) != FTP_FILE_STATUS) {
|
|
|
|
|
_ftp_seterr(e);
|
|
|
|
|
return -1;
|
|
|
|
|
}
|
|
|
|
|
for (ln = last_reply + 4; *ln && isspace(*ln); ln++)
|
|
|
|
|
/* nothing */ ;
|
|
|
|
|
for (us->size = 0; *ln && isdigit(*ln); ln++)
|
|
|
|
|
us->size = us->size * 10 + *ln - '0';
|
|
|
|
|
if (*ln && !isspace(*ln)) {
|
|
|
|
|
_ftp_seterr(FTP_PROTOCOL_ERROR);
|
|
|
|
|
return -1;
|
|
|
|
|
}
|
2000-07-25 14:41:02 +00:00
|
|
|
|
if (us->size == 0)
|
|
|
|
|
us->size = -1;
|
2000-07-17 21:25:00 +00:00
|
|
|
|
DEBUG(fprintf(stderr, "size: [\033[1m%lld\033[m]\n", us->size));
|
|
|
|
|
|
|
|
|
|
if ((e = _ftp_cmd(cd, "MDTM %s", s)) != FTP_FILE_STATUS) {
|
|
|
|
|
_ftp_seterr(e);
|
|
|
|
|
return -1;
|
|
|
|
|
}
|
|
|
|
|
for (ln = last_reply + 4; *ln && isspace(*ln); ln++)
|
|
|
|
|
/* nothing */ ;
|
|
|
|
|
switch (strspn(ln, "0123456789")) {
|
|
|
|
|
case 14:
|
|
|
|
|
break;
|
|
|
|
|
case 15:
|
|
|
|
|
ln++;
|
|
|
|
|
ln[0] = '2';
|
|
|
|
|
ln[1] = '0';
|
|
|
|
|
break;
|
|
|
|
|
default:
|
|
|
|
|
_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);
|
|
|
|
|
return -1;
|
|
|
|
|
}
|
|
|
|
|
tm.tm_mon--;
|
|
|
|
|
tm.tm_year -= 1900;
|
|
|
|
|
tm.tm_isdst = -1;
|
|
|
|
|
t = timegm(&tm);
|
|
|
|
|
if (t == (time_t)-1)
|
|
|
|
|
t = time(NULL);
|
|
|
|
|
us->mtime = t;
|
|
|
|
|
us->atime = t;
|
|
|
|
|
DEBUG(fprintf(stderr, "last modified: [\033[1m%04d-%02d-%02d "
|
|
|
|
|
"%02d:%02d:%02d\033[m]\n",
|
|
|
|
|
tm.tm_year + 1900, tm.tm_mon + 1, tm.tm_mday,
|
|
|
|
|
tm.tm_hour, tm.tm_min, tm.tm_sec));
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
1998-07-09 16:52:44 +00:00
|
|
|
|
/*
|
1998-07-12 22:34:40 +00:00
|
|
|
|
* Transfer file
|
1998-07-09 16:52:44 +00:00
|
|
|
|
*/
|
|
|
|
|
static FILE *
|
2000-05-07 20:00:12 +00:00
|
|
|
|
_ftp_transfer(int cd, char *oper, char *file,
|
|
|
|
|
char *mode, off_t offset, char *flags)
|
1998-07-09 16:52:44 +00:00
|
|
|
|
{
|
2000-05-20 18:23:51 +00:00
|
|
|
|
struct sockaddr_storage sin;
|
|
|
|
|
struct sockaddr_in6 *sin6;
|
|
|
|
|
struct sockaddr_in *sin4;
|
2000-01-07 10:59:12 +00:00
|
|
|
|
int pasv, high, verbose;
|
|
|
|
|
int e, sd = -1;
|
|
|
|
|
socklen_t l;
|
1998-07-11 21:29:08 +00:00
|
|
|
|
char *s;
|
|
|
|
|
FILE *df;
|
2000-01-07 10:59:12 +00:00
|
|
|
|
|
|
|
|
|
/* check flags */
|
|
|
|
|
pasv = (flags && strchr(flags, 'p'));
|
|
|
|
|
high = (flags && strchr(flags, 'h'));
|
|
|
|
|
verbose = (flags && strchr(flags, 'v'));
|
|
|
|
|
|
2000-05-26 12:56:53 +00:00
|
|
|
|
/* passive mode */
|
2000-10-17 19:01:18 +00:00
|
|
|
|
if (!pasv)
|
|
|
|
|
pasv = ((s = getenv("FTP_PASSIVE_MODE")) == NULL ||
|
|
|
|
|
strncasecmp(s, "no", 2) != 0);
|
2000-05-26 12:56:53 +00:00
|
|
|
|
|
2000-05-20 18:23:51 +00:00
|
|
|
|
/* find our own address, bind, and listen */
|
|
|
|
|
l = sizeof sin;
|
|
|
|
|
if (getsockname(cd, (struct sockaddr *)&sin, &l) == -1)
|
|
|
|
|
goto sysouch;
|
|
|
|
|
if (sin.ss_family == AF_INET6)
|
|
|
|
|
unmappedaddr((struct sockaddr_in6 *)&sin);
|
|
|
|
|
|
1998-07-11 21:29:08 +00:00
|
|
|
|
/* open data socket */
|
2000-05-20 18:23:51 +00:00
|
|
|
|
if ((sd = socket(sin.ss_family, SOCK_STREAM, IPPROTO_TCP)) == -1) {
|
1998-11-05 19:48:17 +00:00
|
|
|
|
_fetch_syserr();
|
1998-07-11 21:29:08 +00:00
|
|
|
|
return NULL;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (pasv) {
|
2000-05-20 18:23:51 +00:00
|
|
|
|
u_char addr[64];
|
1998-07-11 21:29:08 +00:00
|
|
|
|
char *ln, *p;
|
|
|
|
|
int i;
|
2000-05-20 18:23:51 +00:00
|
|
|
|
int port;
|
1998-07-11 21:29:08 +00:00
|
|
|
|
|
|
|
|
|
/* send PASV command */
|
2000-01-07 10:59:12 +00:00
|
|
|
|
if (verbose)
|
|
|
|
|
_fetch_info("setting passive mode");
|
2000-05-20 18:23:51 +00:00
|
|
|
|
switch (sin.ss_family) {
|
|
|
|
|
case AF_INET:
|
|
|
|
|
if ((e = _ftp_cmd(cd, "PASV")) != FTP_PASSIVE_MODE)
|
|
|
|
|
goto ouch;
|
|
|
|
|
break;
|
|
|
|
|
case AF_INET6:
|
|
|
|
|
if ((e = _ftp_cmd(cd, "EPSV")) != FTP_EPASSIVE_MODE) {
|
|
|
|
|
if (e == -1)
|
|
|
|
|
goto ouch;
|
|
|
|
|
if ((e = _ftp_cmd(cd, "LPSV")) != FTP_LPASSIVE_MODE)
|
|
|
|
|
goto ouch;
|
|
|
|
|
}
|
|
|
|
|
break;
|
|
|
|
|
default:
|
2000-07-17 21:00:49 +00:00
|
|
|
|
e = FTP_PROTOCOL_ERROR; /* XXX: error code should be prepared */
|
1998-07-11 21:29:08 +00:00
|
|
|
|
goto ouch;
|
2000-05-20 18:23:51 +00:00
|
|
|
|
}
|
1998-07-11 21:29:08 +00:00
|
|
|
|
|
2000-01-07 10:59:12 +00:00
|
|
|
|
/*
|
|
|
|
|
* Find address and port number. The reply to the PASV command
|
|
|
|
|
* is IMHO the one and only weak point in the FTP protocol.
|
|
|
|
|
*/
|
2000-01-07 12:58:40 +00:00
|
|
|
|
ln = last_reply;
|
2000-07-10 08:41:25 +00:00
|
|
|
|
switch (e) {
|
2000-05-20 18:23:51 +00:00
|
|
|
|
case FTP_PASSIVE_MODE:
|
|
|
|
|
case FTP_LPASSIVE_MODE:
|
2000-07-10 08:41:25 +00:00
|
|
|
|
for (p = ln + 3; *p && !isdigit(*p); p++)
|
|
|
|
|
/* nothing */ ;
|
|
|
|
|
if (!*p) {
|
2000-07-17 21:00:49 +00:00
|
|
|
|
e = FTP_PROTOCOL_ERROR;
|
2000-07-10 08:41:25 +00:00
|
|
|
|
goto ouch;
|
|
|
|
|
}
|
2000-05-20 18:23:51 +00:00
|
|
|
|
l = (e == FTP_PASSIVE_MODE ? 6 : 21);
|
|
|
|
|
for (i = 0; *p && i < l; i++, p++)
|
|
|
|
|
addr[i] = strtol(p, &p, 10);
|
|
|
|
|
if (i < l) {
|
2000-07-17 21:00:49 +00:00
|
|
|
|
e = FTP_PROTOCOL_ERROR;
|
2000-05-20 18:23:51 +00:00
|
|
|
|
goto ouch;
|
|
|
|
|
}
|
|
|
|
|
break;
|
|
|
|
|
case FTP_EPASSIVE_MODE:
|
2000-07-10 08:41:25 +00:00
|
|
|
|
for (p = ln + 3; *p && *p != '('; p++)
|
|
|
|
|
/* nothing */ ;
|
|
|
|
|
if (!*p) {
|
2000-07-17 21:00:49 +00:00
|
|
|
|
e = FTP_PROTOCOL_ERROR;
|
2000-07-10 08:41:25 +00:00
|
|
|
|
goto ouch;
|
|
|
|
|
}
|
|
|
|
|
++p;
|
2000-05-20 18:23:51 +00:00
|
|
|
|
if (sscanf(p, "%c%c%c%d%c", &addr[0], &addr[1], &addr[2],
|
|
|
|
|
&port, &addr[3]) != 5 ||
|
|
|
|
|
addr[0] != addr[1] ||
|
|
|
|
|
addr[0] != addr[2] || addr[0] != addr[3]) {
|
2000-07-17 21:00:49 +00:00
|
|
|
|
e = FTP_PROTOCOL_ERROR;
|
2000-05-20 18:23:51 +00:00
|
|
|
|
goto ouch;
|
|
|
|
|
}
|
|
|
|
|
break;
|
|
|
|
|
}
|
1998-07-11 21:29:08 +00:00
|
|
|
|
|
2000-05-07 20:00:12 +00:00
|
|
|
|
/* seek to required offset */
|
|
|
|
|
if (offset)
|
|
|
|
|
if (_ftp_cmd(cd, "REST %lu", (u_long)offset) != FTP_FILE_OK)
|
|
|
|
|
goto sysouch;
|
|
|
|
|
|
1998-07-11 21:29:08 +00:00
|
|
|
|
/* construct sockaddr for data socket */
|
2000-05-07 20:00:12 +00:00
|
|
|
|
l = sizeof sin;
|
2000-01-07 12:58:40 +00:00
|
|
|
|
if (getpeername(cd, (struct sockaddr *)&sin, &l) == -1)
|
1998-07-11 21:29:08 +00:00
|
|
|
|
goto sysouch;
|
2000-05-20 18:23:51 +00:00
|
|
|
|
if (sin.ss_family == AF_INET6)
|
|
|
|
|
unmappedaddr((struct sockaddr_in6 *)&sin);
|
|
|
|
|
switch (sin.ss_family) {
|
|
|
|
|
case AF_INET6:
|
|
|
|
|
sin6 = (struct sockaddr_in6 *)&sin;
|
|
|
|
|
if (e == FTP_EPASSIVE_MODE)
|
|
|
|
|
sin6->sin6_port = htons(port);
|
|
|
|
|
else {
|
|
|
|
|
bcopy(addr + 2, (char *)&sin6->sin6_addr, 16);
|
|
|
|
|
bcopy(addr + 19, (char *)&sin6->sin6_port, 2);
|
|
|
|
|
}
|
|
|
|
|
break;
|
|
|
|
|
case AF_INET:
|
|
|
|
|
sin4 = (struct sockaddr_in *)&sin;
|
|
|
|
|
if (e == FTP_EPASSIVE_MODE)
|
|
|
|
|
sin4->sin_port = htons(port);
|
|
|
|
|
else {
|
|
|
|
|
bcopy(addr, (char *)&sin4->sin_addr, 4);
|
|
|
|
|
bcopy(addr + 4, (char *)&sin4->sin_port, 2);
|
|
|
|
|
}
|
|
|
|
|
break;
|
|
|
|
|
default:
|
2000-07-17 21:00:49 +00:00
|
|
|
|
e = FTP_PROTOCOL_ERROR; /* XXX: error code should be prepared */
|
2000-05-20 18:23:51 +00:00
|
|
|
|
break;
|
|
|
|
|
}
|
1998-07-11 21:29:08 +00:00
|
|
|
|
|
|
|
|
|
/* connect to data port */
|
2000-01-07 10:59:12 +00:00
|
|
|
|
if (verbose)
|
|
|
|
|
_fetch_info("opening data connection");
|
2000-05-20 18:23:51 +00:00
|
|
|
|
if (connect(sd, (struct sockaddr *)&sin, sin.ss_len) == -1)
|
1998-07-11 21:29:08 +00:00
|
|
|
|
goto sysouch;
|
2000-05-07 20:00:12 +00:00
|
|
|
|
|
1998-07-11 21:29:08 +00:00
|
|
|
|
/* make the server initiate the transfer */
|
2000-06-20 13:57:00 +00:00
|
|
|
|
if (verbose)
|
|
|
|
|
_fetch_info("initiating transfer");
|
2000-07-17 21:25:00 +00:00
|
|
|
|
e = _ftp_cmd(cd, "%s %s", oper, _ftp_filename(file));
|
2000-08-21 07:18:31 +00:00
|
|
|
|
if (e != FTP_CONNECTION_ALREADY_OPEN && e != FTP_OPEN_DATA_CONNECTION)
|
1998-07-11 21:29:08 +00:00
|
|
|
|
goto ouch;
|
|
|
|
|
|
|
|
|
|
} else {
|
|
|
|
|
u_int32_t a;
|
|
|
|
|
u_short p;
|
2000-01-07 10:59:12 +00:00
|
|
|
|
int arg, d;
|
2000-05-20 18:23:51 +00:00
|
|
|
|
char *ap;
|
|
|
|
|
char hname[INET6_ADDRSTRLEN];
|
1998-07-11 21:29:08 +00:00
|
|
|
|
|
2000-05-20 18:23:51 +00:00
|
|
|
|
switch (sin.ss_family) {
|
|
|
|
|
case AF_INET6:
|
|
|
|
|
((struct sockaddr_in6 *)&sin)->sin6_port = 0;
|
|
|
|
|
#ifdef IPV6_PORTRANGE
|
|
|
|
|
arg = high ? IPV6_PORTRANGE_HIGH : IPV6_PORTRANGE_DEFAULT;
|
|
|
|
|
if (setsockopt(sd, IPPROTO_IPV6, IPV6_PORTRANGE,
|
|
|
|
|
(char *)&arg, sizeof(arg)) == -1)
|
|
|
|
|
goto sysouch;
|
|
|
|
|
#endif
|
|
|
|
|
break;
|
|
|
|
|
case AF_INET:
|
|
|
|
|
((struct sockaddr_in *)&sin)->sin_port = 0;
|
|
|
|
|
arg = high ? IP_PORTRANGE_HIGH : IP_PORTRANGE_DEFAULT;
|
|
|
|
|
if (setsockopt(sd, IPPROTO_IP, IP_PORTRANGE,
|
|
|
|
|
(char *)&arg, sizeof arg) == -1)
|
|
|
|
|
goto sysouch;
|
|
|
|
|
break;
|
|
|
|
|
}
|
2000-01-07 10:59:12 +00:00
|
|
|
|
if (verbose)
|
|
|
|
|
_fetch_info("binding data socket");
|
2000-05-20 18:23:51 +00:00
|
|
|
|
if (bind(sd, (struct sockaddr *)&sin, sin.ss_len) == -1)
|
1998-07-11 21:29:08 +00:00
|
|
|
|
goto sysouch;
|
1998-08-17 09:30:19 +00:00
|
|
|
|
if (listen(sd, 1) == -1)
|
1998-07-11 21:29:08 +00:00
|
|
|
|
goto sysouch;
|
|
|
|
|
|
|
|
|
|
/* find what port we're on and tell the server */
|
1998-08-17 09:30:19 +00:00
|
|
|
|
if (getsockname(sd, (struct sockaddr *)&sin, &l) == -1)
|
1998-07-11 21:29:08 +00:00
|
|
|
|
goto sysouch;
|
2000-05-20 18:23:51 +00:00
|
|
|
|
switch (sin.ss_family) {
|
|
|
|
|
case AF_INET:
|
|
|
|
|
sin4 = (struct sockaddr_in *)&sin;
|
|
|
|
|
a = ntohl(sin4->sin_addr.s_addr);
|
|
|
|
|
p = ntohs(sin4->sin_port);
|
|
|
|
|
e = _ftp_cmd(cd, "PORT %d,%d,%d,%d,%d,%d",
|
|
|
|
|
(a >> 24) & 0xff, (a >> 16) & 0xff,
|
|
|
|
|
(a >> 8) & 0xff, a & 0xff,
|
|
|
|
|
(p >> 8) & 0xff, p & 0xff);
|
|
|
|
|
break;
|
|
|
|
|
case AF_INET6:
|
|
|
|
|
#define UC(b) (((int)b)&0xff)
|
|
|
|
|
e = -1;
|
|
|
|
|
sin6 = (struct sockaddr_in6 *)&sin;
|
|
|
|
|
if (getnameinfo((struct sockaddr *)&sin, sin.ss_len,
|
|
|
|
|
hname, sizeof(hname),
|
|
|
|
|
NULL, 0, NI_NUMERICHOST) == 0) {
|
|
|
|
|
e = _ftp_cmd(cd, "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(cd,
|
|
|
|
|
"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]),
|
|
|
|
|
UC(ap[4]), UC(ap[5]), UC(ap[6]), UC(ap[7]),
|
|
|
|
|
UC(ap[8]), UC(ap[9]), UC(ap[10]), UC(ap[11]),
|
|
|
|
|
UC(ap[12]), UC(ap[13]), UC(ap[14]), UC(ap[15]),
|
|
|
|
|
2,
|
|
|
|
|
(ntohs(sin6->sin6_port) >> 8) & 0xff,
|
|
|
|
|
ntohs(sin6->sin6_port) & 0xff);
|
|
|
|
|
}
|
|
|
|
|
break;
|
|
|
|
|
default:
|
2000-07-17 21:00:49 +00:00
|
|
|
|
e = FTP_PROTOCOL_ERROR; /* XXX: error code should be prepared */
|
2000-05-20 18:23:51 +00:00
|
|
|
|
goto ouch;
|
|
|
|
|
}
|
1998-12-16 15:29:03 +00:00
|
|
|
|
if (e != FTP_OK)
|
1998-07-11 21:29:08 +00:00
|
|
|
|
goto ouch;
|
|
|
|
|
|
2000-06-29 10:44:10 +00:00
|
|
|
|
/* seek to required offset */
|
|
|
|
|
if (offset)
|
|
|
|
|
if (_ftp_cmd(cd, "REST %lu", (u_long)offset) != FTP_FILE_OK)
|
|
|
|
|
goto sysouch;
|
|
|
|
|
|
1998-07-11 21:29:08 +00:00
|
|
|
|
/* make the server initiate the transfer */
|
2000-01-07 10:59:12 +00:00
|
|
|
|
if (verbose)
|
|
|
|
|
_fetch_info("initiating transfer");
|
2000-07-17 21:25:00 +00:00
|
|
|
|
e = _ftp_cmd(cd, "%s %s", oper, _ftp_filename(file));
|
1998-12-16 15:29:03 +00:00
|
|
|
|
if (e != FTP_OPEN_DATA_CONNECTION)
|
1998-07-11 21:29:08 +00:00
|
|
|
|
goto ouch;
|
|
|
|
|
|
|
|
|
|
/* accept the incoming connection and go to town */
|
1998-08-17 09:30:19 +00:00
|
|
|
|
if ((d = accept(sd, NULL, NULL)) == -1)
|
1998-07-11 21:29:08 +00:00
|
|
|
|
goto sysouch;
|
|
|
|
|
close(sd);
|
|
|
|
|
sd = d;
|
|
|
|
|
}
|
|
|
|
|
|
1998-07-12 22:34:40 +00:00
|
|
|
|
if ((df = fdopen(sd, mode)) == NULL)
|
1998-07-11 21:29:08 +00:00
|
|
|
|
goto sysouch;
|
|
|
|
|
return df;
|
|
|
|
|
|
|
|
|
|
sysouch:
|
1998-11-05 19:48:17 +00:00
|
|
|
|
_fetch_syserr();
|
2000-05-20 18:23:51 +00:00
|
|
|
|
if (sd >= 0)
|
|
|
|
|
close(sd);
|
1998-12-16 15:29:03 +00:00
|
|
|
|
return NULL;
|
|
|
|
|
|
1998-07-11 21:29:08 +00:00
|
|
|
|
ouch:
|
2000-01-07 12:58:40 +00:00
|
|
|
|
if (e != -1)
|
|
|
|
|
_ftp_seterr(e);
|
2000-05-20 18:23:51 +00:00
|
|
|
|
if (sd >= 0)
|
|
|
|
|
close(sd);
|
1998-07-11 18:56:01 +00:00
|
|
|
|
return NULL;
|
|
|
|
|
}
|
|
|
|
|
|
2000-07-25 11:45:38 +00:00
|
|
|
|
/*
|
|
|
|
|
* Return default port
|
|
|
|
|
*/
|
|
|
|
|
static int
|
|
|
|
|
_ftp_default_port(void)
|
|
|
|
|
{
|
|
|
|
|
struct servent *se;
|
|
|
|
|
|
2000-10-12 22:10:26 +00:00
|
|
|
|
if ((se = getservbyname(SCHEME_FTP, "tcp")) != NULL)
|
2000-07-25 11:45:38 +00:00
|
|
|
|
return ntohs(se->s_port);
|
|
|
|
|
return FTP_DEFAULT_PORT;
|
|
|
|
|
}
|
|
|
|
|
|
1998-07-11 18:56:01 +00:00
|
|
|
|
/*
|
|
|
|
|
* Log on to FTP server
|
|
|
|
|
*/
|
2000-01-07 12:58:40 +00:00
|
|
|
|
static int
|
2000-10-12 22:10:26 +00:00
|
|
|
|
_ftp_connect(struct url *url, struct url *purl, char *flags)
|
1998-07-11 18:56:01 +00:00
|
|
|
|
{
|
2000-10-12 22:10:26 +00:00
|
|
|
|
int cd, e, direct, verbose;
|
2000-05-20 18:23:51 +00:00
|
|
|
|
#ifdef INET6
|
|
|
|
|
int af = AF_UNSPEC;
|
|
|
|
|
#else
|
|
|
|
|
int af = AF_INET;
|
|
|
|
|
#endif
|
2000-05-22 13:01:13 +00:00
|
|
|
|
const char *logname;
|
2000-10-12 22:10:26 +00:00
|
|
|
|
char *user, *pwd;
|
2000-05-22 13:01:13 +00:00
|
|
|
|
char localhost[MAXHOSTNAMELEN];
|
|
|
|
|
char pbuf[MAXHOSTNAMELEN + MAXLOGNAME + 1];
|
1998-07-11 18:56:01 +00:00
|
|
|
|
|
2000-01-07 10:59:12 +00:00
|
|
|
|
direct = (flags && strchr(flags, 'd'));
|
|
|
|
|
verbose = (flags && strchr(flags, 'v'));
|
2000-05-20 18:23:51 +00:00
|
|
|
|
if ((flags && strchr(flags, '4')))
|
|
|
|
|
af = AF_INET;
|
|
|
|
|
else if ((flags && strchr(flags, '6')))
|
|
|
|
|
af = AF_INET6;
|
|
|
|
|
|
2000-10-12 22:10:26 +00:00
|
|
|
|
if (direct)
|
|
|
|
|
purl = NULL;
|
|
|
|
|
|
1998-07-12 22:34:40 +00:00
|
|
|
|
/* check for proxy */
|
2000-10-12 22:10:26 +00:00
|
|
|
|
if (purl) {
|
|
|
|
|
/* XXX proxy authentication! */
|
|
|
|
|
cd = _fetch_connect(purl->host, purl->port, af, verbose);
|
1998-07-12 22:34:40 +00:00
|
|
|
|
} else {
|
|
|
|
|
/* no proxy, go straight to target */
|
2000-10-12 22:10:26 +00:00
|
|
|
|
cd = _fetch_connect(url->host, url->port, af, verbose);
|
|
|
|
|
purl = NULL;
|
1998-07-12 22:34:40 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* check connection */
|
2000-01-07 12:58:40 +00:00
|
|
|
|
if (cd == -1) {
|
1998-11-05 19:48:17 +00:00
|
|
|
|
_fetch_syserr();
|
1998-07-11 18:56:01 +00:00
|
|
|
|
return NULL;
|
|
|
|
|
}
|
1998-07-12 22:34:40 +00:00
|
|
|
|
|
1998-07-11 18:56:01 +00:00
|
|
|
|
/* expect welcome message */
|
2000-01-07 12:58:40 +00:00
|
|
|
|
if ((e = _ftp_chkerr(cd)) != FTP_SERVICE_READY)
|
1998-07-11 18:56:01 +00:00
|
|
|
|
goto fouch;
|
2000-10-12 22:10:26 +00:00
|
|
|
|
|
|
|
|
|
/* XXX FTP_AUTH, and maybe .netrc */
|
1998-07-11 18:56:01 +00:00
|
|
|
|
|
|
|
|
|
/* send user name and password */
|
2000-10-12 22:10:26 +00:00
|
|
|
|
user = url->user;
|
1998-07-12 22:34:40 +00:00
|
|
|
|
if (!user || !*user)
|
|
|
|
|
user = FTP_ANONYMOUS_USER;
|
2000-10-12 22:10:26 +00:00
|
|
|
|
if (purl && url->port == FTP_DEFAULT_PORT)
|
2000-10-13 09:36:46 +00:00
|
|
|
|
e = _ftp_cmd(cd, "USER %s@%s", user, url->host);
|
2000-10-12 22:10:26 +00:00
|
|
|
|
else if (purl)
|
2000-10-13 09:36:46 +00:00
|
|
|
|
e = _ftp_cmd(cd, "USER %s@%s@%d", user, url->host, url->port);
|
2000-07-21 10:25:33 +00:00
|
|
|
|
else
|
2000-10-13 09:36:46 +00:00
|
|
|
|
e = _ftp_cmd(cd, "USER %s", user);
|
1998-07-12 22:34:40 +00:00
|
|
|
|
|
|
|
|
|
/* did the server request a password? */
|
|
|
|
|
if (e == FTP_NEED_PASSWORD) {
|
2000-10-12 22:10:26 +00:00
|
|
|
|
pwd = url->pwd;
|
1998-07-12 22:34:40 +00:00
|
|
|
|
if (!pwd || !*pwd)
|
2000-05-22 13:01:13 +00:00
|
|
|
|
pwd = getenv("FTP_PASSWORD");
|
|
|
|
|
if (!pwd || !*pwd) {
|
|
|
|
|
if ((logname = getlogin()) == 0)
|
|
|
|
|
logname = FTP_ANONYMOUS_PASSWORD;
|
|
|
|
|
gethostname(localhost, sizeof localhost);
|
|
|
|
|
snprintf(pbuf, sizeof pbuf, "%s@%s", logname, localhost);
|
|
|
|
|
pwd = pbuf;
|
|
|
|
|
}
|
2000-01-07 12:58:40 +00:00
|
|
|
|
e = _ftp_cmd(cd, "PASS %s", pwd);
|
1998-07-12 22:34:40 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* did the server request an account? */
|
1998-12-16 15:29:03 +00:00
|
|
|
|
if (e == FTP_NEED_ACCOUNT)
|
1998-12-16 11:44:31 +00:00
|
|
|
|
goto fouch;
|
1998-07-12 22:34:40 +00:00
|
|
|
|
|
|
|
|
|
/* we should be done by now */
|
1998-12-16 15:29:03 +00:00
|
|
|
|
if (e != FTP_LOGGED_IN)
|
1998-07-11 18:56:01 +00:00
|
|
|
|
goto fouch;
|
|
|
|
|
|
|
|
|
|
/* might as well select mode and type at once */
|
|
|
|
|
#ifdef FTP_FORCE_STREAM_MODE
|
2000-01-07 12:58:40 +00:00
|
|
|
|
if ((e = _ftp_cmd(cd, "MODE S")) != FTP_OK) /* default is S */
|
1998-12-16 15:29:03 +00:00
|
|
|
|
goto fouch;
|
1998-07-11 18:56:01 +00:00
|
|
|
|
#endif
|
2000-01-07 12:58:40 +00:00
|
|
|
|
if ((e = _ftp_cmd(cd, "TYPE I")) != FTP_OK) /* default is A */
|
1998-12-16 15:29:03 +00:00
|
|
|
|
goto fouch;
|
1998-07-11 18:56:01 +00:00
|
|
|
|
|
|
|
|
|
/* done */
|
2000-01-07 12:58:40 +00:00
|
|
|
|
return cd;
|
1998-07-11 18:56:01 +00:00
|
|
|
|
|
|
|
|
|
fouch:
|
2000-01-07 12:58:40 +00:00
|
|
|
|
if (e != -1)
|
|
|
|
|
_ftp_seterr(e);
|
|
|
|
|
close(cd);
|
1998-07-09 16:52:44 +00:00
|
|
|
|
return NULL;
|
|
|
|
|
}
|
|
|
|
|
|
1998-07-11 18:56:01 +00:00
|
|
|
|
/*
|
|
|
|
|
* Disconnect from server
|
|
|
|
|
*/
|
|
|
|
|
static void
|
2000-01-07 12:58:40 +00:00
|
|
|
|
_ftp_disconnect(int cd)
|
1998-07-11 18:56:01 +00:00
|
|
|
|
{
|
2000-01-07 12:58:40 +00:00
|
|
|
|
(void)_ftp_cmd(cd, "QUIT");
|
|
|
|
|
close(cd);
|
1998-07-11 18:56:01 +00:00
|
|
|
|
}
|
1998-07-09 16:52:44 +00:00
|
|
|
|
|
|
|
|
|
/*
|
1998-07-11 18:56:01 +00:00
|
|
|
|
* Check if we're already connected
|
1998-07-09 16:52:44 +00:00
|
|
|
|
*/
|
1998-07-11 18:56:01 +00:00
|
|
|
|
static int
|
Second of a series of cleanups to libfetch.
This commit introduces the following features:
a) the fetchStat*() functions, which return meta-information for a
document, such as size, modification time, etc.
b) the use of the com_err(3) facilities to report errors.
It also fixes a bunch of style bugs and a few logic bugs and somewhat
improves the man page.
Changed files, in alphabetical order:
Makefile:
Don't generate macros in {ftp,http}err.c.
Generate category fields for the error message lists.
Compile the error table.
Install fetch_err.h along with fetch.h.
common.c:
Remove the _netdb_errstring() macro, and add FETCH_ERR_NETDB to the
error code in the _netdb_seterr() macro.
Add categories to the _netdb_errlist table.
Report errors through the Common Error library.
common.h:
Add the DEBUG macros.
Add prototype for fetchConnect().
Remove the prototype for _fetch_errstring(), which is local to common.c
Add a categroy field to struct fetcherr, and define constants for
error categories.
Define macros for _{url,netdb,ftp,http}_seterr().
errors.et: (new file)
List error categories.
fetch.3:
Document the fetchStat*() functions.
Move the "unimplemented functionality" comments from NOTES to BUGS.
Document that applications which use libfetch must also use
libcom_err, and list existing error codes.
Undocument fetchLastErr{Code,String}.
Remove the (empty) DIAGNOSTICS section.
Mention Eugene Skepner in the AUTHORS section.
fetch.c:
Move the DEBUG macros to common.c
Add fetchStat() and fetchStatURL().
Generate error messages for URL parser errors, and fix a minor bug
in the parser.
Use 'struct url' instead of 'url_t'.
Remove fetchLastErr{Code,String}.
fetch.h:
Use 'struct url' instead of 'url_t', and remove the typedef.
Define struct url_stat (used by fetchStat()).
Add prototypes for fetchStat*().
Remove the declarations for fetchLastErr{Code,String}.
Include fetch_err.h.
fetch_err.et: (new file)
Error table for libfetch.
file.c:
Add fetchStatFile().
Use 'struct url' instead of 'url_t'.
ftp.c:
Add fetchStatFTP().
Use 'struct url' instead of 'url_t'.
Don't use fetchLastErrCode.
ftp.errors:
Add categories to all error messages.
http.c:
Add fetchStatHTTP().
Use 'struct url' instead of 'url_t'.
Don't use fetchLastErr{Code,Text}.
http.errors:
Add categories to all error messages.
Prompted by: jkh and Eugene Skepner
Numerous sugestions from: Garett Wollman and Eugene Skepner
1998-11-06 22:14:08 +00:00
|
|
|
|
_ftp_isconnected(struct url *url)
|
1998-07-11 18:56:01 +00:00
|
|
|
|
{
|
|
|
|
|
return (cached_socket
|
|
|
|
|
&& (strcmp(url->host, cached_host.host) == 0)
|
|
|
|
|
&& (strcmp(url->user, cached_host.user) == 0)
|
|
|
|
|
&& (strcmp(url->pwd, cached_host.pwd) == 0)
|
|
|
|
|
&& (url->port == cached_host.port));
|
|
|
|
|
}
|
|
|
|
|
|
1998-07-12 22:34:40 +00:00
|
|
|
|
/*
|
1998-12-16 15:29:03 +00:00
|
|
|
|
* Check the cache, reconnect if no luck
|
1998-07-12 22:34:40 +00:00
|
|
|
|
*/
|
2000-01-07 12:58:40 +00:00
|
|
|
|
static int
|
2000-10-12 22:10:26 +00:00
|
|
|
|
_ftp_cached_connect(struct url *url, struct url *purl, char *flags)
|
1998-07-09 16:52:44 +00:00
|
|
|
|
{
|
2000-01-07 12:58:40 +00:00
|
|
|
|
int e, cd;
|
1998-07-09 16:52:44 +00:00
|
|
|
|
|
2000-01-07 12:58:40 +00:00
|
|
|
|
cd = -1;
|
1998-12-16 15:29:03 +00:00
|
|
|
|
|
1998-07-11 18:56:01 +00:00
|
|
|
|
/* set default port */
|
2000-07-25 11:45:38 +00:00
|
|
|
|
if (!url->port)
|
|
|
|
|
url->port = _ftp_default_port();
|
1998-07-09 16:52:44 +00:00
|
|
|
|
|
1998-12-16 11:44:31 +00:00
|
|
|
|
/* try to use previously cached connection */
|
2000-01-07 12:58:40 +00:00
|
|
|
|
if (_ftp_isconnected(url)) {
|
|
|
|
|
e = _ftp_cmd(cached_socket, "NOOP");
|
|
|
|
|
if (e == FTP_OK || e == FTP_SYNTAX_ERROR)
|
2000-10-12 22:10:26 +00:00
|
|
|
|
return cached_socket;
|
2000-01-07 12:58:40 +00:00
|
|
|
|
}
|
1998-07-11 18:56:01 +00:00
|
|
|
|
|
|
|
|
|
/* connect to server */
|
2000-10-12 22:10:26 +00:00
|
|
|
|
if ((cd = _ftp_connect(url, purl, flags)) == -1)
|
|
|
|
|
return -1;
|
|
|
|
|
if (cached_socket)
|
|
|
|
|
_ftp_disconnect(cached_socket);
|
|
|
|
|
cached_socket = cd;
|
|
|
|
|
memcpy(&cached_host, url, sizeof *url);
|
2000-01-07 12:58:40 +00:00
|
|
|
|
return cd;
|
1998-07-09 16:52:44 +00:00
|
|
|
|
}
|
|
|
|
|
|
2000-07-21 10:46:22 +00:00
|
|
|
|
/*
|
2000-10-12 22:10:26 +00:00
|
|
|
|
* Check the proxy settings
|
2000-07-21 10:46:22 +00:00
|
|
|
|
*/
|
2000-10-12 22:10:26 +00:00
|
|
|
|
static struct url *
|
|
|
|
|
_ftp_get_proxy(void)
|
2000-07-21 10:46:22 +00:00
|
|
|
|
{
|
2000-10-12 22:10:26 +00:00
|
|
|
|
struct url *purl;
|
2000-07-21 10:46:22 +00:00
|
|
|
|
char *p;
|
2000-10-12 22:10:26 +00:00
|
|
|
|
|
|
|
|
|
if (((p = getenv("FTP_PROXY")) || (p = getenv("HTTP_PROXY"))) &&
|
|
|
|
|
*p && (purl = fetchParseURL(p)) != NULL) {
|
|
|
|
|
if (!*purl->scheme)
|
|
|
|
|
strcpy(purl->scheme, SCHEME_FTP);
|
|
|
|
|
if (!purl->port)
|
|
|
|
|
purl->port = _ftp_default_port();
|
|
|
|
|
if (strcasecmp(purl->scheme, SCHEME_FTP) == 0 ||
|
|
|
|
|
strcasecmp(purl->scheme, SCHEME_HTTP) == 0)
|
|
|
|
|
return purl;
|
|
|
|
|
fetchFreeURL(purl);
|
|
|
|
|
}
|
|
|
|
|
return NULL;
|
2000-07-21 10:46:22 +00:00
|
|
|
|
}
|
|
|
|
|
|
1998-07-11 18:56:01 +00:00
|
|
|
|
/*
|
2000-07-17 21:25:00 +00:00
|
|
|
|
* Get and stat file
|
1998-07-11 18:56:01 +00:00
|
|
|
|
*/
|
1998-07-09 16:52:44 +00:00
|
|
|
|
FILE *
|
2000-07-17 21:25:00 +00:00
|
|
|
|
fetchXGetFTP(struct url *url, struct url_stat *us, char *flags)
|
1998-07-09 16:52:44 +00:00
|
|
|
|
{
|
2000-10-12 22:10:26 +00:00
|
|
|
|
struct url *purl;
|
2000-01-07 12:58:40 +00:00
|
|
|
|
int cd;
|
2000-07-21 10:46:22 +00:00
|
|
|
|
|
2000-10-12 22:10:26 +00:00
|
|
|
|
/* get the proxy URL, and check if we should use HTTP instead */
|
|
|
|
|
if (!strchr(flags, 'd') && (purl = _ftp_get_proxy()) != NULL) {
|
|
|
|
|
if (strcasecmp(purl->scheme, SCHEME_HTTP) == 0)
|
|
|
|
|
return _http_request(url, "GET", us, purl, flags);
|
|
|
|
|
} else {
|
|
|
|
|
purl = NULL;
|
|
|
|
|
}
|
2000-01-07 12:58:40 +00:00
|
|
|
|
|
1998-12-16 15:29:03 +00:00
|
|
|
|
/* connect to server */
|
2000-10-12 22:10:26 +00:00
|
|
|
|
cd = _ftp_cached_connect(url, purl, flags);
|
|
|
|
|
if (purl)
|
|
|
|
|
fetchFreeURL(purl);
|
|
|
|
|
if (cd == NULL)
|
1998-12-16 15:29:03 +00:00
|
|
|
|
return NULL;
|
|
|
|
|
|
2000-07-17 21:25:00 +00:00
|
|
|
|
/* change directory */
|
|
|
|
|
if (_ftp_cwd(cd, url->doc) == -1)
|
|
|
|
|
return NULL;
|
|
|
|
|
|
|
|
|
|
/* stat file */
|
2000-07-18 07:12:26 +00:00
|
|
|
|
if (us && _ftp_stat(cd, url->doc, us) == -1
|
2000-07-27 08:48:48 +00:00
|
|
|
|
&& fetchLastErrCode != FETCH_PROTO
|
2000-07-18 07:12:26 +00:00
|
|
|
|
&& fetchLastErrCode != FETCH_UNAVAIL)
|
2000-07-17 21:25:00 +00:00
|
|
|
|
return NULL;
|
|
|
|
|
|
1998-12-16 15:29:03 +00:00
|
|
|
|
/* initiate the transfer */
|
2000-05-07 20:00:12 +00:00
|
|
|
|
return _ftp_transfer(cd, "RETR", url->doc, "r", url->offset, flags);
|
1998-07-12 22:34:40 +00:00
|
|
|
|
}
|
1998-07-11 18:56:01 +00:00
|
|
|
|
|
2000-07-17 21:25:00 +00:00
|
|
|
|
/*
|
|
|
|
|
* Get file
|
|
|
|
|
*/
|
|
|
|
|
FILE *
|
|
|
|
|
fetchGetFTP(struct url *url, char *flags)
|
|
|
|
|
{
|
|
|
|
|
return fetchXGetFTP(url, NULL, flags);
|
|
|
|
|
}
|
|
|
|
|
|
1998-12-16 15:29:03 +00:00
|
|
|
|
/*
|
|
|
|
|
* Put file
|
|
|
|
|
*/
|
1998-07-12 22:34:40 +00:00
|
|
|
|
FILE *
|
Second of a series of cleanups to libfetch.
This commit introduces the following features:
a) the fetchStat*() functions, which return meta-information for a
document, such as size, modification time, etc.
b) the use of the com_err(3) facilities to report errors.
It also fixes a bunch of style bugs and a few logic bugs and somewhat
improves the man page.
Changed files, in alphabetical order:
Makefile:
Don't generate macros in {ftp,http}err.c.
Generate category fields for the error message lists.
Compile the error table.
Install fetch_err.h along with fetch.h.
common.c:
Remove the _netdb_errstring() macro, and add FETCH_ERR_NETDB to the
error code in the _netdb_seterr() macro.
Add categories to the _netdb_errlist table.
Report errors through the Common Error library.
common.h:
Add the DEBUG macros.
Add prototype for fetchConnect().
Remove the prototype for _fetch_errstring(), which is local to common.c
Add a categroy field to struct fetcherr, and define constants for
error categories.
Define macros for _{url,netdb,ftp,http}_seterr().
errors.et: (new file)
List error categories.
fetch.3:
Document the fetchStat*() functions.
Move the "unimplemented functionality" comments from NOTES to BUGS.
Document that applications which use libfetch must also use
libcom_err, and list existing error codes.
Undocument fetchLastErr{Code,String}.
Remove the (empty) DIAGNOSTICS section.
Mention Eugene Skepner in the AUTHORS section.
fetch.c:
Move the DEBUG macros to common.c
Add fetchStat() and fetchStatURL().
Generate error messages for URL parser errors, and fix a minor bug
in the parser.
Use 'struct url' instead of 'url_t'.
Remove fetchLastErr{Code,String}.
fetch.h:
Use 'struct url' instead of 'url_t', and remove the typedef.
Define struct url_stat (used by fetchStat()).
Add prototypes for fetchStat*().
Remove the declarations for fetchLastErr{Code,String}.
Include fetch_err.h.
fetch_err.et: (new file)
Error table for libfetch.
file.c:
Add fetchStatFile().
Use 'struct url' instead of 'url_t'.
ftp.c:
Add fetchStatFTP().
Use 'struct url' instead of 'url_t'.
Don't use fetchLastErrCode.
ftp.errors:
Add categories to all error messages.
http.c:
Add fetchStatHTTP().
Use 'struct url' instead of 'url_t'.
Don't use fetchLastErr{Code,Text}.
http.errors:
Add categories to all error messages.
Prompted by: jkh and Eugene Skepner
Numerous sugestions from: Garett Wollman and Eugene Skepner
1998-11-06 22:14:08 +00:00
|
|
|
|
fetchPutFTP(struct url *url, char *flags)
|
1998-07-12 22:34:40 +00:00
|
|
|
|
{
|
2000-10-12 22:10:26 +00:00
|
|
|
|
struct url *purl;
|
2000-01-07 12:58:40 +00:00
|
|
|
|
int cd;
|
1998-12-16 15:29:03 +00:00
|
|
|
|
|
2000-10-12 22:10:26 +00:00
|
|
|
|
/* get the proxy URL, and check if we should use HTTP instead */
|
|
|
|
|
if (!strchr(flags, 'd') && (purl = _ftp_get_proxy()) != NULL) {
|
|
|
|
|
if (strcasecmp(purl->scheme, SCHEME_HTTP) == 0)
|
|
|
|
|
/* XXX HTTP PUT is not implemented, so try without the proxy */
|
|
|
|
|
purl = NULL;
|
|
|
|
|
} else {
|
|
|
|
|
purl = NULL;
|
|
|
|
|
}
|
2000-07-21 10:46:22 +00:00
|
|
|
|
|
1998-12-16 15:29:03 +00:00
|
|
|
|
/* connect to server */
|
2000-10-12 22:10:26 +00:00
|
|
|
|
cd = _ftp_cached_connect(url, purl, flags);
|
|
|
|
|
if (purl)
|
|
|
|
|
fetchFreeURL(purl);
|
|
|
|
|
if (cd == NULL)
|
1998-12-16 15:29:03 +00:00
|
|
|
|
return NULL;
|
|
|
|
|
|
2000-07-17 21:25:00 +00:00
|
|
|
|
/* change directory */
|
|
|
|
|
if (_ftp_cwd(cd, url->doc) == -1)
|
|
|
|
|
return NULL;
|
|
|
|
|
|
1998-12-16 15:29:03 +00:00
|
|
|
|
/* initiate the transfer */
|
2000-01-07 12:58:40 +00:00
|
|
|
|
return _ftp_transfer(cd, (flags && strchr(flags, 'a')) ? "APPE" : "STOR",
|
2000-05-07 20:00:12 +00:00
|
|
|
|
url->doc, "w", url->offset, flags);
|
1998-07-09 16:52:44 +00:00
|
|
|
|
}
|
Second of a series of cleanups to libfetch.
This commit introduces the following features:
a) the fetchStat*() functions, which return meta-information for a
document, such as size, modification time, etc.
b) the use of the com_err(3) facilities to report errors.
It also fixes a bunch of style bugs and a few logic bugs and somewhat
improves the man page.
Changed files, in alphabetical order:
Makefile:
Don't generate macros in {ftp,http}err.c.
Generate category fields for the error message lists.
Compile the error table.
Install fetch_err.h along with fetch.h.
common.c:
Remove the _netdb_errstring() macro, and add FETCH_ERR_NETDB to the
error code in the _netdb_seterr() macro.
Add categories to the _netdb_errlist table.
Report errors through the Common Error library.
common.h:
Add the DEBUG macros.
Add prototype for fetchConnect().
Remove the prototype for _fetch_errstring(), which is local to common.c
Add a categroy field to struct fetcherr, and define constants for
error categories.
Define macros for _{url,netdb,ftp,http}_seterr().
errors.et: (new file)
List error categories.
fetch.3:
Document the fetchStat*() functions.
Move the "unimplemented functionality" comments from NOTES to BUGS.
Document that applications which use libfetch must also use
libcom_err, and list existing error codes.
Undocument fetchLastErr{Code,String}.
Remove the (empty) DIAGNOSTICS section.
Mention Eugene Skepner in the AUTHORS section.
fetch.c:
Move the DEBUG macros to common.c
Add fetchStat() and fetchStatURL().
Generate error messages for URL parser errors, and fix a minor bug
in the parser.
Use 'struct url' instead of 'url_t'.
Remove fetchLastErr{Code,String}.
fetch.h:
Use 'struct url' instead of 'url_t', and remove the typedef.
Define struct url_stat (used by fetchStat()).
Add prototypes for fetchStat*().
Remove the declarations for fetchLastErr{Code,String}.
Include fetch_err.h.
fetch_err.et: (new file)
Error table for libfetch.
file.c:
Add fetchStatFile().
Use 'struct url' instead of 'url_t'.
ftp.c:
Add fetchStatFTP().
Use 'struct url' instead of 'url_t'.
Don't use fetchLastErrCode.
ftp.errors:
Add categories to all error messages.
http.c:
Add fetchStatHTTP().
Use 'struct url' instead of 'url_t'.
Don't use fetchLastErr{Code,Text}.
http.errors:
Add categories to all error messages.
Prompted by: jkh and Eugene Skepner
Numerous sugestions from: Garett Wollman and Eugene Skepner
1998-11-06 22:14:08 +00:00
|
|
|
|
|
1998-12-16 15:29:03 +00:00
|
|
|
|
/*
|
|
|
|
|
* Get file stats
|
|
|
|
|
*/
|
Second of a series of cleanups to libfetch.
This commit introduces the following features:
a) the fetchStat*() functions, which return meta-information for a
document, such as size, modification time, etc.
b) the use of the com_err(3) facilities to report errors.
It also fixes a bunch of style bugs and a few logic bugs and somewhat
improves the man page.
Changed files, in alphabetical order:
Makefile:
Don't generate macros in {ftp,http}err.c.
Generate category fields for the error message lists.
Compile the error table.
Install fetch_err.h along with fetch.h.
common.c:
Remove the _netdb_errstring() macro, and add FETCH_ERR_NETDB to the
error code in the _netdb_seterr() macro.
Add categories to the _netdb_errlist table.
Report errors through the Common Error library.
common.h:
Add the DEBUG macros.
Add prototype for fetchConnect().
Remove the prototype for _fetch_errstring(), which is local to common.c
Add a categroy field to struct fetcherr, and define constants for
error categories.
Define macros for _{url,netdb,ftp,http}_seterr().
errors.et: (new file)
List error categories.
fetch.3:
Document the fetchStat*() functions.
Move the "unimplemented functionality" comments from NOTES to BUGS.
Document that applications which use libfetch must also use
libcom_err, and list existing error codes.
Undocument fetchLastErr{Code,String}.
Remove the (empty) DIAGNOSTICS section.
Mention Eugene Skepner in the AUTHORS section.
fetch.c:
Move the DEBUG macros to common.c
Add fetchStat() and fetchStatURL().
Generate error messages for URL parser errors, and fix a minor bug
in the parser.
Use 'struct url' instead of 'url_t'.
Remove fetchLastErr{Code,String}.
fetch.h:
Use 'struct url' instead of 'url_t', and remove the typedef.
Define struct url_stat (used by fetchStat()).
Add prototypes for fetchStat*().
Remove the declarations for fetchLastErr{Code,String}.
Include fetch_err.h.
fetch_err.et: (new file)
Error table for libfetch.
file.c:
Add fetchStatFile().
Use 'struct url' instead of 'url_t'.
ftp.c:
Add fetchStatFTP().
Use 'struct url' instead of 'url_t'.
Don't use fetchLastErrCode.
ftp.errors:
Add categories to all error messages.
http.c:
Add fetchStatHTTP().
Use 'struct url' instead of 'url_t'.
Don't use fetchLastErr{Code,Text}.
http.errors:
Add categories to all error messages.
Prompted by: jkh and Eugene Skepner
Numerous sugestions from: Garett Wollman and Eugene Skepner
1998-11-06 22:14:08 +00:00
|
|
|
|
int
|
|
|
|
|
fetchStatFTP(struct url *url, struct url_stat *us, char *flags)
|
|
|
|
|
{
|
2000-10-12 22:10:26 +00:00
|
|
|
|
struct url *purl;
|
2000-07-17 21:25:00 +00:00
|
|
|
|
int cd;
|
1998-12-16 15:29:03 +00:00
|
|
|
|
|
2000-10-12 22:10:26 +00:00
|
|
|
|
/* get the proxy URL, and check if we should use HTTP instead */
|
|
|
|
|
if (!strchr(flags, 'd') && (purl = _ftp_get_proxy()) != NULL) {
|
|
|
|
|
if (strcasecmp(purl->scheme, SCHEME_HTTP) == 0) {
|
|
|
|
|
FILE *f;
|
|
|
|
|
|
|
|
|
|
if ((f = _http_request(url, "HEAD", us, purl, flags)) == NULL)
|
|
|
|
|
return -1;
|
|
|
|
|
fclose(f);
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
} else {
|
|
|
|
|
purl = NULL;
|
|
|
|
|
}
|
2000-07-21 10:46:22 +00:00
|
|
|
|
|
1998-12-16 15:29:03 +00:00
|
|
|
|
/* connect to server */
|
2000-10-12 22:10:26 +00:00
|
|
|
|
cd = _ftp_cached_connect(url, purl, flags);
|
|
|
|
|
if (purl)
|
|
|
|
|
fetchFreeURL(purl);
|
|
|
|
|
if (cd == NULL)
|
|
|
|
|
return NULL;
|
|
|
|
|
|
1998-12-16 15:29:03 +00:00
|
|
|
|
/* change directory */
|
2000-07-17 21:25:00 +00:00
|
|
|
|
if (_ftp_cwd(cd, url->doc) == -1)
|
1998-12-16 15:29:03 +00:00
|
|
|
|
return -1;
|
|
|
|
|
|
2000-07-17 21:25:00 +00:00
|
|
|
|
/* stat file */
|
|
|
|
|
return _ftp_stat(cd, url->doc, us);
|
Second of a series of cleanups to libfetch.
This commit introduces the following features:
a) the fetchStat*() functions, which return meta-information for a
document, such as size, modification time, etc.
b) the use of the com_err(3) facilities to report errors.
It also fixes a bunch of style bugs and a few logic bugs and somewhat
improves the man page.
Changed files, in alphabetical order:
Makefile:
Don't generate macros in {ftp,http}err.c.
Generate category fields for the error message lists.
Compile the error table.
Install fetch_err.h along with fetch.h.
common.c:
Remove the _netdb_errstring() macro, and add FETCH_ERR_NETDB to the
error code in the _netdb_seterr() macro.
Add categories to the _netdb_errlist table.
Report errors through the Common Error library.
common.h:
Add the DEBUG macros.
Add prototype for fetchConnect().
Remove the prototype for _fetch_errstring(), which is local to common.c
Add a categroy field to struct fetcherr, and define constants for
error categories.
Define macros for _{url,netdb,ftp,http}_seterr().
errors.et: (new file)
List error categories.
fetch.3:
Document the fetchStat*() functions.
Move the "unimplemented functionality" comments from NOTES to BUGS.
Document that applications which use libfetch must also use
libcom_err, and list existing error codes.
Undocument fetchLastErr{Code,String}.
Remove the (empty) DIAGNOSTICS section.
Mention Eugene Skepner in the AUTHORS section.
fetch.c:
Move the DEBUG macros to common.c
Add fetchStat() and fetchStatURL().
Generate error messages for URL parser errors, and fix a minor bug
in the parser.
Use 'struct url' instead of 'url_t'.
Remove fetchLastErr{Code,String}.
fetch.h:
Use 'struct url' instead of 'url_t', and remove the typedef.
Define struct url_stat (used by fetchStat()).
Add prototypes for fetchStat*().
Remove the declarations for fetchLastErr{Code,String}.
Include fetch_err.h.
fetch_err.et: (new file)
Error table for libfetch.
file.c:
Add fetchStatFile().
Use 'struct url' instead of 'url_t'.
ftp.c:
Add fetchStatFTP().
Use 'struct url' instead of 'url_t'.
Don't use fetchLastErrCode.
ftp.errors:
Add categories to all error messages.
http.c:
Add fetchStatHTTP().
Use 'struct url' instead of 'url_t'.
Don't use fetchLastErr{Code,Text}.
http.errors:
Add categories to all error messages.
Prompted by: jkh and Eugene Skepner
Numerous sugestions from: Garett Wollman and Eugene Skepner
1998-11-06 22:14:08 +00:00
|
|
|
|
}
|
1998-12-21 19:41:50 +00:00
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
|
* List a directory
|
|
|
|
|
*/
|
|
|
|
|
extern void warnx(char *, ...);
|
|
|
|
|
struct url_ent *
|
|
|
|
|
fetchListFTP(struct url *url, char *flags)
|
|
|
|
|
{
|
2000-06-20 13:57:00 +00:00
|
|
|
|
warnx("fetchListFTP(): not implemented");
|
|
|
|
|
return NULL;
|
1998-12-21 19:41:50 +00:00
|
|
|
|
}
|