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.
|
|
|
|
|
*
|
1998-12-21 19:41:50 +00:00
|
|
|
|
* $Id: ftp.c,v 1.11 1998/12/18 14:32:48 des Exp $
|
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>
|
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
|
|
|
|
#define FTP_DEFAULT_PORT 21
|
|
|
|
|
|
|
|
|
|
#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
|
|
|
|
|
#define FTP_LOGGED_IN 230
|
|
|
|
|
#define FTP_FILE_ACTION_OK 250
|
|
|
|
|
#define FTP_NEED_PASSWORD 331
|
|
|
|
|
#define FTP_NEED_ACCOUNT 332
|
1998-07-09 16:52:44 +00:00
|
|
|
|
|
1998-07-11 18:56:01 +00:00
|
|
|
|
#define ENDL "\r\n"
|
|
|
|
|
|
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;
|
1998-07-09 16:52:44 +00:00
|
|
|
|
static FILE *cached_socket;
|
|
|
|
|
|
1998-12-16 15:29:03 +00:00
|
|
|
|
static char _ftp_last_reply[1024];
|
1998-07-11 18:56:01 +00:00
|
|
|
|
|
1998-07-09 16:52:44 +00:00
|
|
|
|
/*
|
|
|
|
|
* Get server response, check that first digit is a '2'
|
|
|
|
|
*/
|
|
|
|
|
static int
|
1998-12-16 11:44:31 +00:00
|
|
|
|
_ftp_chkerr(FILE *s)
|
1998-07-09 16:52:44 +00:00
|
|
|
|
{
|
|
|
|
|
char *line;
|
|
|
|
|
size_t len;
|
|
|
|
|
|
|
|
|
|
do {
|
1998-07-11 21:29:08 +00:00
|
|
|
|
if (((line = fgetln(s, &len)) == NULL) || (len < 4)) {
|
1998-11-05 19:48:17 +00:00
|
|
|
|
_fetch_syserr();
|
1998-07-09 16:52:44 +00:00
|
|
|
|
return -1;
|
1998-07-11 18:56:01 +00:00
|
|
|
|
}
|
1998-12-16 15:29:03 +00:00
|
|
|
|
} while (len >= 4 && line[3] == '-');
|
1998-07-11 21:29:08 +00:00
|
|
|
|
|
1998-12-16 15:29:03 +00:00
|
|
|
|
while (len && isspace(line[len-1]))
|
|
|
|
|
len--;
|
|
|
|
|
snprintf(_ftp_last_reply, sizeof(_ftp_last_reply),
|
|
|
|
|
"%*.*s", (int)len, (int)len, line);
|
1998-07-11 21:29:08 +00:00
|
|
|
|
|
|
|
|
|
#ifndef NDEBUG
|
|
|
|
|
fprintf(stderr, "\033[1m<<< ");
|
1998-12-16 15:29:03 +00:00
|
|
|
|
fprintf(stderr, "%*.*s\n", (int)len, (int)len, line);
|
1998-07-11 21:29:08 +00:00
|
|
|
|
fprintf(stderr, "\033[m");
|
|
|
|
|
#endif
|
1998-07-09 16:52:44 +00:00
|
|
|
|
|
1998-12-16 15:29:03 +00:00
|
|
|
|
if (len < 4 || !isdigit(line[1]) || !isdigit(line[1])
|
1998-07-11 18:56:01 +00:00
|
|
|
|
|| !isdigit(line[2]) || (line[3] != ' ')) {
|
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
|
|
|
|
|
1998-12-16 11:44:31 +00:00
|
|
|
|
return (line[0] - '0') * 100 + (line[1] - '0') * 10 + (line[2] - '0');
|
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
|
1998-07-11 21:29:08 +00:00
|
|
|
|
_ftp_cmd(FILE *f, char *fmt, ...)
|
1998-07-09 16:52:44 +00:00
|
|
|
|
{
|
1998-07-11 21:29:08 +00:00
|
|
|
|
va_list ap;
|
|
|
|
|
|
|
|
|
|
va_start(ap, fmt);
|
|
|
|
|
vfprintf(f, fmt, ap);
|
|
|
|
|
#ifndef NDEBUG
|
|
|
|
|
fprintf(stderr, "\033[1m>>> ");
|
|
|
|
|
vfprintf(stderr, fmt, ap);
|
|
|
|
|
fprintf(stderr, "\033[m");
|
|
|
|
|
#endif
|
|
|
|
|
va_end(ap);
|
1998-07-11 18:56:01 +00:00
|
|
|
|
|
1998-12-16 11:44:31 +00:00
|
|
|
|
return _ftp_chkerr(f);
|
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 *
|
1998-07-12 22:34:40 +00:00
|
|
|
|
_ftp_transfer(FILE *cf, char *oper, char *file, char *mode, int pasv)
|
1998-07-09 16:52:44 +00:00
|
|
|
|
{
|
1998-07-11 21:29:08 +00:00
|
|
|
|
struct sockaddr_in sin;
|
1998-12-16 15:29:03 +00:00
|
|
|
|
int e, sd = -1, l;
|
1998-07-11 21:29:08 +00:00
|
|
|
|
char *s;
|
|
|
|
|
FILE *df;
|
1998-07-11 18:56:01 +00:00
|
|
|
|
|
1998-07-09 16:52:44 +00:00
|
|
|
|
/* change directory */
|
1998-07-11 21:29:08 +00:00
|
|
|
|
if (((s = strrchr(file, '/')) != NULL) && (s != file)) {
|
|
|
|
|
*s = 0;
|
1998-12-16 15:29:03 +00:00
|
|
|
|
if ((e = _ftp_cmd(cf, "CWD %s" ENDL, file)) != FTP_FILE_ACTION_OK) {
|
1998-07-11 21:29:08 +00:00
|
|
|
|
*s = '/';
|
1998-12-16 15:29:03 +00:00
|
|
|
|
_ftp_seterr(e);
|
1998-07-09 16:52:44 +00:00
|
|
|
|
return NULL;
|
|
|
|
|
}
|
1998-07-11 21:29:08 +00:00
|
|
|
|
*s++ = '/';
|
1998-07-09 16:52:44 +00:00
|
|
|
|
} else {
|
1998-12-16 15:29:03 +00:00
|
|
|
|
if ((e = _ftp_cmd(cf, "CWD /" ENDL)) != FTP_FILE_ACTION_OK) {
|
|
|
|
|
_ftp_seterr(e);
|
1998-07-09 16:52:44 +00:00
|
|
|
|
return NULL;
|
1998-12-16 15:29:03 +00:00
|
|
|
|
}
|
1998-07-09 16:52:44 +00:00
|
|
|
|
}
|
|
|
|
|
|
1998-07-11 21:29:08 +00:00
|
|
|
|
/* s now points to file name */
|
|
|
|
|
|
|
|
|
|
/* open data socket */
|
1998-08-17 09:30:19 +00:00
|
|
|
|
if ((sd = socket(PF_INET, 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) {
|
|
|
|
|
u_char addr[6];
|
|
|
|
|
char *ln, *p;
|
|
|
|
|
int i;
|
|
|
|
|
|
|
|
|
|
/* send PASV command */
|
1998-12-16 15:29:03 +00:00
|
|
|
|
if ((e = _ftp_cmd(cf, "PASV" ENDL)) != FTP_PASSIVE_MODE)
|
1998-07-11 21:29:08 +00:00
|
|
|
|
goto ouch;
|
|
|
|
|
|
|
|
|
|
/* find address and port number. The reply to the PASV command
|
|
|
|
|
is IMHO the one and only weak point in the FTP protocol. */
|
|
|
|
|
ln = _ftp_last_reply;
|
|
|
|
|
for (p = ln + 3; !isdigit(*p); p++)
|
|
|
|
|
/* nothing */ ;
|
|
|
|
|
for (p--, i = 0; i < 6; i++) {
|
|
|
|
|
p++; /* skip the comma */
|
|
|
|
|
addr[i] = strtol(p, &p, 10);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* construct sockaddr for data socket */
|
|
|
|
|
l = sizeof(sin);
|
1998-08-17 09:30:19 +00:00
|
|
|
|
if (getpeername(fileno(cf), (struct sockaddr *)&sin, &l) == -1)
|
1998-07-11 21:29:08 +00:00
|
|
|
|
goto sysouch;
|
|
|
|
|
bcopy(addr, (char *)&sin.sin_addr, 4);
|
|
|
|
|
bcopy(addr + 4, (char *)&sin.sin_port, 2);
|
|
|
|
|
|
|
|
|
|
/* connect to data port */
|
1998-08-17 09:30:19 +00:00
|
|
|
|
if (connect(sd, (struct sockaddr *)&sin, sizeof(sin)) == -1)
|
1998-07-11 21:29:08 +00:00
|
|
|
|
goto sysouch;
|
|
|
|
|
|
|
|
|
|
/* make the server initiate the transfer */
|
1998-12-16 15:29:03 +00:00
|
|
|
|
e = _ftp_cmd(cf, "%s %s" ENDL, oper, s);
|
|
|
|
|
if (e != FTP_OPEN_DATA_CONNECTION)
|
1998-07-11 21:29:08 +00:00
|
|
|
|
goto ouch;
|
|
|
|
|
|
|
|
|
|
} else {
|
|
|
|
|
u_int32_t a;
|
|
|
|
|
u_short p;
|
|
|
|
|
int d;
|
|
|
|
|
|
|
|
|
|
/* find our own address, bind, and listen */
|
|
|
|
|
l = sizeof(sin);
|
1998-08-17 09:30:19 +00:00
|
|
|
|
if (getsockname(fileno(cf), (struct sockaddr *)&sin, &l) == -1)
|
1998-07-11 21:29:08 +00:00
|
|
|
|
goto sysouch;
|
|
|
|
|
sin.sin_port = 0;
|
1998-08-17 09:30:19 +00:00
|
|
|
|
if (bind(sd, (struct sockaddr *)&sin, l) == -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;
|
|
|
|
|
a = ntohl(sin.sin_addr.s_addr);
|
|
|
|
|
p = ntohs(sin.sin_port);
|
1998-12-16 15:29:03 +00:00
|
|
|
|
e = _ftp_cmd(cf, "PORT %d,%d,%d,%d,%d,%d" ENDL,
|
|
|
|
|
(a >> 24) & 0xff, (a >> 16) & 0xff,
|
|
|
|
|
(a >> 8) & 0xff, a & 0xff,
|
|
|
|
|
(p >> 8) & 0xff, p & 0xff);
|
|
|
|
|
if (e != FTP_OK)
|
1998-07-11 21:29:08 +00:00
|
|
|
|
goto ouch;
|
|
|
|
|
|
|
|
|
|
/* make the server initiate the transfer */
|
1998-12-16 15:29:03 +00:00
|
|
|
|
e = _ftp_cmd(cf, "%s %s" ENDL, oper, s);
|
|
|
|
|
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();
|
1998-12-16 15:29:03 +00:00
|
|
|
|
close(sd);
|
|
|
|
|
return NULL;
|
|
|
|
|
|
1998-07-11 21:29:08 +00:00
|
|
|
|
ouch:
|
1998-12-16 15:29:03 +00:00
|
|
|
|
_ftp_seterr(e);
|
1998-07-11 21:29:08 +00:00
|
|
|
|
close(sd);
|
1998-07-11 18:56:01 +00:00
|
|
|
|
return NULL;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
|
* Log on to FTP server
|
|
|
|
|
*/
|
|
|
|
|
static FILE *
|
1998-12-16 10:24:55 +00:00
|
|
|
|
_ftp_connect(char *host, int port, char *user, char *pwd, int verbose)
|
1998-07-11 18:56:01 +00:00
|
|
|
|
{
|
1998-07-12 22:34:40 +00:00
|
|
|
|
int sd, e, pp = FTP_DEFAULT_PORT;
|
|
|
|
|
char *p, *q;
|
1998-07-11 18:56:01 +00:00
|
|
|
|
FILE *f;
|
|
|
|
|
|
1998-07-12 22:34:40 +00:00
|
|
|
|
/* check for proxy */
|
|
|
|
|
if ((p = getenv("FTP_PROXY")) != NULL) {
|
|
|
|
|
if ((q = strchr(p, ':')) != NULL) {
|
|
|
|
|
/* XXX check that it's a valid number */
|
|
|
|
|
pp = atoi(q+1);
|
|
|
|
|
}
|
|
|
|
|
if (q)
|
|
|
|
|
*q = 0;
|
1998-12-18 14:32:48 +00:00
|
|
|
|
sd = _fetch_connect(p, pp, verbose);
|
1998-07-12 22:34:40 +00:00
|
|
|
|
if (q)
|
|
|
|
|
*q = ':';
|
|
|
|
|
} else {
|
|
|
|
|
/* no proxy, go straight to target */
|
1998-12-18 14:32:48 +00:00
|
|
|
|
sd = _fetch_connect(host, port, verbose);
|
1998-07-12 22:34:40 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* check connection */
|
1998-08-17 09:30:19 +00:00
|
|
|
|
if (sd == -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
|
|
|
|
|
|
|
|
|
/* streams make life easier */
|
1998-07-11 18:56:01 +00:00
|
|
|
|
if ((f = fdopen(sd, "r+")) == NULL) {
|
1998-11-05 19:48:17 +00:00
|
|
|
|
_fetch_syserr();
|
1998-12-16 15:29:03 +00:00
|
|
|
|
close(sd);
|
|
|
|
|
return NULL;
|
1998-07-11 18:56:01 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* expect welcome message */
|
1998-12-16 15:29:03 +00:00
|
|
|
|
if ((e = _ftp_chkerr(f)) != FTP_SERVICE_READY)
|
1998-07-11 18:56:01 +00:00
|
|
|
|
goto fouch;
|
|
|
|
|
|
|
|
|
|
/* send user name and password */
|
1998-07-12 22:34:40 +00:00
|
|
|
|
if (!user || !*user)
|
|
|
|
|
user = FTP_ANONYMOUS_USER;
|
|
|
|
|
e = p ? _ftp_cmd(f, "USER %s@%s@%d" ENDL, user, host, port)
|
|
|
|
|
: _ftp_cmd(f, "USER %s" ENDL, user);
|
|
|
|
|
|
|
|
|
|
/* did the server request a password? */
|
|
|
|
|
if (e == FTP_NEED_PASSWORD) {
|
|
|
|
|
if (!pwd || !*pwd)
|
|
|
|
|
pwd = FTP_ANONYMOUS_PASSWORD;
|
1998-07-11 21:29:08 +00:00
|
|
|
|
e = _ftp_cmd(f, "PASS %s" ENDL, 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
|
1998-12-16 15:29:03 +00:00
|
|
|
|
if ((e = _ftp_cmd(f, "MODE S" ENDL)) != FTP_OK) /* default is S */
|
|
|
|
|
goto fouch;
|
1998-07-11 18:56:01 +00:00
|
|
|
|
#endif
|
1998-12-16 15:29:03 +00:00
|
|
|
|
if ((e = _ftp_cmd(f, "TYPE I" ENDL)) != FTP_OK) /* default is A */
|
|
|
|
|
goto fouch;
|
1998-07-11 18:56:01 +00:00
|
|
|
|
|
|
|
|
|
/* done */
|
|
|
|
|
return f;
|
|
|
|
|
|
|
|
|
|
fouch:
|
1998-12-16 15:29:03 +00:00
|
|
|
|
_ftp_seterr(e);
|
1998-07-11 18:56:01 +00:00
|
|
|
|
fclose(f);
|
1998-07-09 16:52:44 +00:00
|
|
|
|
return NULL;
|
|
|
|
|
}
|
|
|
|
|
|
1998-07-11 18:56:01 +00:00
|
|
|
|
/*
|
|
|
|
|
* Disconnect from server
|
|
|
|
|
*/
|
|
|
|
|
static void
|
|
|
|
|
_ftp_disconnect(FILE *f)
|
|
|
|
|
{
|
1998-12-16 11:44:31 +00:00
|
|
|
|
(void)_ftp_cmd(f, "QUIT" ENDL);
|
1998-07-11 18:56:01 +00:00
|
|
|
|
fclose(f);
|
|
|
|
|
}
|
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
|
|
|
|
*/
|
|
|
|
|
static FILE *
|
1998-12-16 15:29:03 +00:00
|
|
|
|
_ftp_cached_connect(struct url *url, char *flags)
|
1998-07-09 16:52:44 +00:00
|
|
|
|
{
|
1998-12-16 15:29:03 +00:00
|
|
|
|
FILE *cf;
|
1998-07-09 16:52:44 +00:00
|
|
|
|
|
1998-12-16 15:29:03 +00:00
|
|
|
|
cf = NULL;
|
|
|
|
|
|
1998-07-11 18:56:01 +00:00
|
|
|
|
/* set default port */
|
|
|
|
|
if (!url->port)
|
1998-07-11 21:29:08 +00:00
|
|
|
|
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 */
|
|
|
|
|
if (_ftp_isconnected(url))
|
1998-12-16 15:29:03 +00:00
|
|
|
|
if (_ftp_cmd(cached_socket, "NOOP" ENDL) != -1)
|
1998-07-11 18:56:01 +00:00
|
|
|
|
cf = cached_socket;
|
|
|
|
|
|
|
|
|
|
/* connect to server */
|
|
|
|
|
if (!cf) {
|
1998-12-16 10:24:55 +00:00
|
|
|
|
cf = _ftp_connect(url->host, url->port, url->user, url->pwd,
|
|
|
|
|
(strchr(flags, 'v') != NULL));
|
1998-07-11 18:56:01 +00:00
|
|
|
|
if (!cf)
|
|
|
|
|
return NULL;
|
|
|
|
|
if (cached_socket)
|
|
|
|
|
_ftp_disconnect(cached_socket);
|
|
|
|
|
cached_socket = cf;
|
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
|
|
|
|
memcpy(&cached_host, url, sizeof(struct url));
|
1998-07-09 16:52:44 +00:00
|
|
|
|
}
|
1998-07-11 18:56:01 +00:00
|
|
|
|
|
1998-12-16 15:29:03 +00:00
|
|
|
|
return cf;
|
1998-07-09 16:52:44 +00:00
|
|
|
|
}
|
|
|
|
|
|
1998-07-11 18:56:01 +00:00
|
|
|
|
/*
|
1998-12-16 15:29:03 +00:00
|
|
|
|
* Get file
|
1998-07-11 18:56:01 +00:00
|
|
|
|
*/
|
1998-07-09 16:52:44 +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
|
|
|
|
fetchGetFTP(struct url *url, char *flags)
|
1998-07-09 16:52:44 +00:00
|
|
|
|
{
|
1998-12-16 15:29:03 +00:00
|
|
|
|
FILE *cf;
|
|
|
|
|
|
|
|
|
|
/* connect to server */
|
|
|
|
|
if ((cf = _ftp_cached_connect(url, flags)) == NULL)
|
|
|
|
|
return NULL;
|
|
|
|
|
|
|
|
|
|
/* initiate the transfer */
|
|
|
|
|
return _ftp_transfer(cf, "RETR", url->doc, "r",
|
|
|
|
|
(flags && strchr(flags, 'p')));
|
1998-07-12 22:34:40 +00:00
|
|
|
|
}
|
1998-07-11 18:56:01 +00:00
|
|
|
|
|
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
|
|
|
|
{
|
1998-12-16 15:29:03 +00:00
|
|
|
|
FILE *cf;
|
|
|
|
|
|
|
|
|
|
/* connect to server */
|
|
|
|
|
if ((cf = _ftp_cached_connect(url, flags)) == NULL)
|
|
|
|
|
return NULL;
|
|
|
|
|
|
|
|
|
|
/* initiate the transfer */
|
|
|
|
|
return _ftp_transfer(cf, (flags && strchr(flags, 'a')) ? "APPE" : "STOR",
|
|
|
|
|
url->doc, "w", (flags && strchr(flags, 'p')));
|
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)
|
|
|
|
|
{
|
1998-12-16 15:29:03 +00:00
|
|
|
|
FILE *cf;
|
|
|
|
|
char *ln, *s;
|
|
|
|
|
struct tm tm;
|
|
|
|
|
time_t t;
|
|
|
|
|
int e;
|
|
|
|
|
|
|
|
|
|
/* connect to server */
|
|
|
|
|
if ((cf = _ftp_cached_connect(url, flags)) == NULL)
|
|
|
|
|
return -1;
|
|
|
|
|
|
|
|
|
|
/* change directory */
|
|
|
|
|
if (((s = strrchr(url->doc, '/')) != NULL) && (s != url->doc)) {
|
|
|
|
|
*s = 0;
|
|
|
|
|
if ((e = _ftp_cmd(cf, "CWD %s" ENDL, url->doc)) != FTP_FILE_ACTION_OK) {
|
|
|
|
|
*s = '/';
|
|
|
|
|
goto ouch;
|
|
|
|
|
}
|
|
|
|
|
*s++ = '/';
|
|
|
|
|
} else {
|
|
|
|
|
if ((e = _ftp_cmd(cf, "CWD /" ENDL)) != FTP_FILE_ACTION_OK)
|
|
|
|
|
goto ouch;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* s now points to file name */
|
|
|
|
|
|
|
|
|
|
if (_ftp_cmd(cf, "SIZE %s" ENDL, s) != FTP_FILE_STATUS)
|
|
|
|
|
goto ouch;
|
|
|
|
|
for (ln = _ftp_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(999); /* XXX should signal a FETCH_PROTO error */
|
|
|
|
|
return -1;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if ((e = _ftp_cmd(cf, "MDTM %s" ENDL, s)) != FTP_FILE_STATUS)
|
|
|
|
|
goto ouch;
|
|
|
|
|
for (ln = _ftp_last_reply + 4; *ln && isspace(*ln); ln++)
|
|
|
|
|
/* nothing */ ;
|
|
|
|
|
t = time(NULL);
|
|
|
|
|
us->mtime = localtime(&t)->tm_gmtoff;
|
|
|
|
|
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);
|
|
|
|
|
/* XXX should check the return value from sscanf */
|
|
|
|
|
tm.tm_mon--;
|
|
|
|
|
tm.tm_year -= 1900;
|
|
|
|
|
tm.tm_isdst = -1;
|
|
|
|
|
tm.tm_gmtoff = 0;
|
|
|
|
|
us->mtime += mktime(&tm);
|
|
|
|
|
us->atime = us->mtime;
|
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
|
|
ouch:
|
|
|
|
|
_ftp_seterr(e);
|
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
|
|
|
|
return -1;
|
|
|
|
|
}
|
1998-12-21 19:41:50 +00:00
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
|
* List a directory
|
|
|
|
|
*/
|
|
|
|
|
extern void warnx(char *, ...);
|
|
|
|
|
struct url_ent *
|
|
|
|
|
fetchListFTP(struct url *url, char *flags)
|
|
|
|
|
{
|
|
|
|
|
warnx("fetchListFTP(): not implemented");
|
|
|
|
|
return NULL;
|
|
|
|
|
}
|