1999-09-15 02:49:14 +04:00
|
|
|
/* $NetBSD: ftp.c,v 1.61 1999/09/14 22:49:14 mycroft Exp $ */
|
1999-07-02 12:07:40 +04:00
|
|
|
|
|
|
|
/*
|
|
|
|
* Copyright (C) 1997 and 1998 WIDE Project.
|
|
|
|
* 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.
|
|
|
|
* 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. Neither the name of the project nor the names of its contributors
|
|
|
|
* may be used to endorse or promote products derived from this software
|
|
|
|
* without specific prior written permission.
|
|
|
|
*
|
|
|
|
* THIS SOFTWARE IS PROVIDED BY THE PROJECT AND CONTRIBUTORS ``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 PROJECT OR CONTRIBUTORS 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.
|
|
|
|
*/
|
1995-09-08 05:05:59 +04:00
|
|
|
|
1993-03-21 12:45:37 +03:00
|
|
|
/*
|
1994-08-25 07:47:50 +04:00
|
|
|
* Copyright (c) 1985, 1989, 1993, 1994
|
|
|
|
* The Regents of the University of California. All rights reserved.
|
1993-03-21 12:45:37 +03:00
|
|
|
*
|
|
|
|
* 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.
|
|
|
|
* 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. All advertising materials mentioning features or use of this software
|
|
|
|
* must display the following acknowledgement:
|
|
|
|
* This product includes software developed by the University of
|
|
|
|
* California, Berkeley and its contributors.
|
|
|
|
* 4. Neither the name of the University nor the names of its contributors
|
|
|
|
* may be used to endorse or promote products derived from this software
|
|
|
|
* without specific prior written permission.
|
|
|
|
*
|
|
|
|
* THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``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 REGENTS OR CONTRIBUTORS 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.
|
|
|
|
*/
|
|
|
|
|
1997-07-20 13:45:35 +04:00
|
|
|
#include <sys/cdefs.h>
|
1993-03-21 12:45:37 +03:00
|
|
|
#ifndef lint
|
1995-09-08 05:05:59 +04:00
|
|
|
#if 0
|
|
|
|
static char sccsid[] = "@(#)ftp.c 8.6 (Berkeley) 10/27/94";
|
|
|
|
#else
|
1999-09-15 02:49:14 +04:00
|
|
|
__RCSID("$NetBSD: ftp.c,v 1.61 1999/09/14 22:49:14 mycroft Exp $");
|
1995-09-08 05:05:59 +04:00
|
|
|
#endif
|
1993-03-21 12:45:37 +03:00
|
|
|
#endif /* not lint */
|
|
|
|
|
1997-01-19 17:19:02 +03:00
|
|
|
#include <sys/types.h>
|
1993-03-21 12:45:37 +03:00
|
|
|
#include <sys/stat.h>
|
|
|
|
#include <sys/socket.h>
|
1998-05-20 04:54:52 +04:00
|
|
|
#include <sys/time.h>
|
1993-03-21 12:45:37 +03:00
|
|
|
|
|
|
|
#include <netinet/in.h>
|
|
|
|
#include <netinet/in_systm.h>
|
|
|
|
#include <netinet/ip.h>
|
1994-08-25 07:47:50 +04:00
|
|
|
#include <arpa/inet.h>
|
1993-03-21 12:45:37 +03:00
|
|
|
#include <arpa/ftp.h>
|
|
|
|
#include <arpa/telnet.h>
|
|
|
|
|
1994-08-25 07:47:50 +04:00
|
|
|
#include <ctype.h>
|
|
|
|
#include <err.h>
|
1993-03-21 12:45:37 +03:00
|
|
|
#include <errno.h>
|
1994-08-25 07:47:50 +04:00
|
|
|
#include <netdb.h>
|
1998-05-20 04:54:52 +04:00
|
|
|
#include <signal.h>
|
1994-08-25 07:47:50 +04:00
|
|
|
#include <stdio.h>
|
|
|
|
#include <stdlib.h>
|
|
|
|
#include <string.h>
|
1998-04-02 01:07:03 +04:00
|
|
|
#include <time.h>
|
1994-08-25 07:47:50 +04:00
|
|
|
#include <unistd.h>
|
1997-03-13 09:23:11 +03:00
|
|
|
#ifdef __STDC__
|
|
|
|
#include <stdarg.h>
|
|
|
|
#else
|
1993-03-21 12:45:37 +03:00
|
|
|
#include <varargs.h>
|
1997-03-13 09:23:11 +03:00
|
|
|
#endif
|
1999-06-24 18:50:56 +04:00
|
|
|
#ifndef __USE_SELECT
|
|
|
|
#include <poll.h>
|
|
|
|
#endif
|
1993-03-21 12:45:37 +03:00
|
|
|
|
|
|
|
#include "ftp_var.h"
|
|
|
|
|
1999-07-02 12:07:40 +04:00
|
|
|
extern int h_errno;
|
|
|
|
|
1993-03-21 12:45:37 +03:00
|
|
|
int data = -1;
|
|
|
|
int abrtflag = 0;
|
1994-08-25 07:47:50 +04:00
|
|
|
jmp_buf ptabort;
|
|
|
|
int ptabflg;
|
1993-03-21 12:45:37 +03:00
|
|
|
int ptflag = 0;
|
1999-07-02 12:07:40 +04:00
|
|
|
off_t restart_point = 0;
|
1993-03-21 12:45:37 +03:00
|
|
|
|
1999-06-24 18:50:56 +04:00
|
|
|
static int empty __P((FILE *, FILE *, int));
|
|
|
|
|
1999-07-02 12:07:40 +04:00
|
|
|
union sockunion {
|
|
|
|
struct sockinet {
|
1999-07-11 00:46:42 +04:00
|
|
|
#ifdef BSD4_4
|
1999-07-02 12:07:40 +04:00
|
|
|
u_char si_len;
|
|
|
|
u_char si_family;
|
1999-07-11 00:46:42 +04:00
|
|
|
#else
|
|
|
|
u_short si_family;
|
|
|
|
#endif
|
1999-07-02 12:07:40 +04:00
|
|
|
u_short si_port;
|
1999-07-11 00:46:42 +04:00
|
|
|
#ifndef BSD4_4
|
|
|
|
u_char si_pad[sizeof(struct sockaddr_in6) - sizeof(u_int)];
|
|
|
|
u_char si_len;
|
|
|
|
#endif
|
1999-07-02 12:07:40 +04:00
|
|
|
} su_si;
|
|
|
|
struct sockaddr_in su_sin;
|
|
|
|
struct sockaddr_in6 su_sin6;
|
|
|
|
};
|
1999-07-11 00:46:42 +04:00
|
|
|
|
1999-07-02 12:07:40 +04:00
|
|
|
#define su_len su_si.si_len
|
|
|
|
#define su_family su_si.si_family
|
|
|
|
#define su_port su_si.si_port
|
|
|
|
|
|
|
|
union sockunion myctladdr, hisctladdr, data_addr;
|
1993-03-21 12:45:37 +03:00
|
|
|
|
|
|
|
FILE *cin, *cout;
|
|
|
|
|
|
|
|
char *
|
|
|
|
hookup(host, port)
|
1999-07-02 12:07:40 +04:00
|
|
|
char *host;
|
|
|
|
char *port;
|
1993-03-21 12:45:37 +03:00
|
|
|
{
|
1999-08-30 02:21:57 +04:00
|
|
|
int s = -1, len, error;
|
|
|
|
#ifdef NI_NUMERICHOST
|
1999-07-03 09:44:11 +04:00
|
|
|
struct addrinfo hints, *res, *res0;
|
1999-07-02 12:07:40 +04:00
|
|
|
char hbuf[MAXHOSTNAMELEN];
|
1999-08-30 02:21:57 +04:00
|
|
|
#else
|
|
|
|
struct hostent *hp = NULL;
|
|
|
|
struct servent *sp = NULL;
|
|
|
|
char **ptr;
|
|
|
|
struct sockaddr_in sin;
|
|
|
|
#endif
|
|
|
|
static char hostnamebuf[MAXHOSTNAMELEN];
|
1999-07-03 09:44:11 +04:00
|
|
|
char *cause = "unknown";
|
1999-08-30 02:21:57 +04:00
|
|
|
int family;
|
1999-07-02 12:07:40 +04:00
|
|
|
|
1999-08-30 02:21:57 +04:00
|
|
|
#ifdef NI_NUMERICHOST
|
1999-07-02 12:07:40 +04:00
|
|
|
memset((char *)&hisctladdr, 0, sizeof (hisctladdr));
|
|
|
|
memset(&hints, 0, sizeof(hints));
|
|
|
|
hints.ai_flags = AI_CANONNAME;
|
|
|
|
hints.ai_family = AF_UNSPEC;
|
|
|
|
hints.ai_socktype = SOCK_STREAM;
|
|
|
|
hints.ai_protocol = 0;
|
1999-07-03 09:44:11 +04:00
|
|
|
error = getaddrinfo(host, port, &hints, &res0);
|
1999-07-02 12:07:40 +04:00
|
|
|
if (error) {
|
1999-09-15 02:49:14 +04:00
|
|
|
warnx(gai_strerror(error));
|
1999-07-02 12:07:40 +04:00
|
|
|
code = -1;
|
|
|
|
return (0);
|
1993-03-21 12:45:37 +03:00
|
|
|
}
|
1999-07-02 12:07:40 +04:00
|
|
|
|
1999-07-03 09:44:11 +04:00
|
|
|
if (res0->ai_canonname)
|
|
|
|
strncpy(hostnamebuf, res0->ai_canonname, sizeof(hostnamebuf));
|
1999-07-02 12:07:40 +04:00
|
|
|
else
|
|
|
|
strncpy(hostnamebuf, host, sizeof(hostnamebuf));
|
|
|
|
hostnamebuf[sizeof(hostnamebuf) - 1] = '\0';
|
1993-03-21 12:45:37 +03:00
|
|
|
hostname = hostnamebuf;
|
1999-07-02 12:07:40 +04:00
|
|
|
|
1999-07-03 09:44:11 +04:00
|
|
|
for (res = res0; res; res = res->ai_next) {
|
|
|
|
#if 0 /*old behavior*/
|
|
|
|
if (res != res0) /* not on the first address */
|
|
|
|
#else
|
|
|
|
if (res0->ai_next) /* if we have multiple possibilities */
|
|
|
|
#endif
|
|
|
|
{
|
1999-07-02 12:07:40 +04:00
|
|
|
getnameinfo(res->ai_addr, res->ai_addrlen,
|
|
|
|
hbuf, sizeof(hbuf), NULL, 0, NI_NUMERICHOST);
|
|
|
|
fprintf(ttyout, "Trying %s...\n", hbuf);
|
1999-07-03 09:44:11 +04:00
|
|
|
}
|
|
|
|
s = socket(res->ai_family, res->ai_socktype, res->ai_protocol);
|
|
|
|
if (s < 0) {
|
|
|
|
cause = "socket";
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
while ((error = xconnect(s, res->ai_addr, res->ai_addrlen)) < 0
|
|
|
|
&& errno == EINTR) {
|
|
|
|
;
|
|
|
|
}
|
|
|
|
if (error) {
|
|
|
|
/* this "if" clause is to prevent print warning twice */
|
|
|
|
if (res->ai_next) {
|
|
|
|
getnameinfo(res->ai_addr, res->ai_addrlen,
|
|
|
|
hbuf, sizeof(hbuf), NULL, 0,
|
|
|
|
NI_NUMERICHOST);
|
|
|
|
warn("connect to address %s", hbuf);
|
1993-03-21 12:45:37 +03:00
|
|
|
}
|
1999-07-03 09:44:11 +04:00
|
|
|
cause = "connect";
|
|
|
|
close(s);
|
|
|
|
s = -1;
|
1993-03-21 12:45:37 +03:00
|
|
|
continue;
|
|
|
|
}
|
1999-07-03 09:44:11 +04:00
|
|
|
|
|
|
|
/* finally we got one */
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
if (s < 0) {
|
|
|
|
warn(cause);
|
1993-03-21 12:45:37 +03:00
|
|
|
code = -1;
|
1999-07-03 09:49:57 +04:00
|
|
|
freeaddrinfo(res0);
|
1999-07-03 09:44:11 +04:00
|
|
|
return 0;
|
1993-03-21 12:45:37 +03:00
|
|
|
}
|
1999-07-02 12:07:40 +04:00
|
|
|
memcpy(&hisctladdr, res->ai_addr, res->ai_addrlen);
|
|
|
|
len = res->ai_addrlen;
|
1999-07-03 09:44:11 +04:00
|
|
|
freeaddrinfo(res0);
|
|
|
|
res0 = res = NULL;
|
1999-08-30 02:21:57 +04:00
|
|
|
family = hisctladdr.su_family;
|
|
|
|
#else
|
|
|
|
memset(&sin, 0, sizeof(sin));
|
|
|
|
sin.sin_family = AF_INET;
|
|
|
|
if ((hp = gethostbyname(host)) == NULL) {
|
|
|
|
warnx("%s: %s", host, hstrerror(h_errno));
|
|
|
|
code = -1;
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
if ((sp = getservbyname(port, "tcp")) == NULL) {
|
|
|
|
sin.sin_port = htons(21);
|
|
|
|
}
|
|
|
|
else
|
|
|
|
sin.sin_port = sp->s_port;
|
|
|
|
|
|
|
|
strncpy(hostnamebuf, hp->h_name, sizeof(hostnamebuf));
|
|
|
|
hostnamebuf[sizeof(hostnamebuf) - 1] = '\0';
|
|
|
|
hostname = hostnamebuf;
|
|
|
|
|
|
|
|
if (hp->h_length > sizeof(sin.sin_addr))
|
|
|
|
hp->h_length = sizeof(sin.sin_addr);
|
|
|
|
|
|
|
|
for (ptr = hp->h_addr_list; *ptr; ptr++) {
|
|
|
|
memcpy(&sin.sin_addr, *ptr, (size_t)hp->h_length);
|
|
|
|
if (hp->h_addr_list[1])
|
|
|
|
fprintf(ttyout, "Trying %s...\n",
|
|
|
|
inet_ntoa(sin.sin_addr));
|
|
|
|
s = socket(AF_INET, SOCK_STREAM, 0);
|
|
|
|
if (s < 0) {
|
|
|
|
cause = "socket";
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
while ((error = xconnect(s, (struct sockaddr *)&sin,
|
|
|
|
sizeof(sin))) < 0 && errno == EINTR) {
|
|
|
|
;
|
|
|
|
}
|
|
|
|
if (error) {
|
|
|
|
/* this "if" clause is to prevent print warning twice */
|
|
|
|
if (hp->h_addr_list[1]) {
|
|
|
|
warn("connect to address %s",
|
|
|
|
inet_ntoa(sin.sin_addr));
|
|
|
|
}
|
|
|
|
cause = "connect";
|
|
|
|
close(s);
|
|
|
|
s = -1;
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* finally we got one */
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
if (s < 0) {
|
|
|
|
warn(cause);
|
|
|
|
code = -1;
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
memcpy(&hisctladdr, &sin, sizeof(sin));
|
|
|
|
len = sizeof(sin);
|
|
|
|
if (hisctladdr.su_len == 0)
|
|
|
|
hisctladdr.su_len = len;
|
|
|
|
family = AF_INET;
|
|
|
|
#endif
|
|
|
|
|
1993-03-21 12:45:37 +03:00
|
|
|
if (getsockname(s, (struct sockaddr *)&myctladdr, &len) < 0) {
|
1994-08-25 07:47:50 +04:00
|
|
|
warn("getsockname");
|
1993-03-21 12:45:37 +03:00
|
|
|
code = -1;
|
|
|
|
goto bad;
|
|
|
|
}
|
1999-08-30 02:21:57 +04:00
|
|
|
if (myctladdr.su_len == 0)
|
|
|
|
myctladdr.su_len = len;
|
|
|
|
|
1999-07-02 12:07:40 +04:00
|
|
|
#if defined(IPPROTO_IP) && defined(IP_TOS)
|
1999-08-30 02:21:57 +04:00
|
|
|
if (family == AF_INET) {
|
1999-07-11 04:41:59 +04:00
|
|
|
int tos = IPTOS_LOWDELAY;
|
1999-07-02 12:07:40 +04:00
|
|
|
if (setsockopt(s, IPPROTO_IP, IP_TOS, (char *)&tos,
|
|
|
|
sizeof(int)) < 0)
|
|
|
|
warn("setsockopt TOS (ignored)");
|
|
|
|
}
|
1993-03-21 12:45:37 +03:00
|
|
|
#endif
|
|
|
|
cin = fdopen(s, "r");
|
|
|
|
cout = fdopen(s, "w");
|
|
|
|
if (cin == NULL || cout == NULL) {
|
1994-08-25 07:47:50 +04:00
|
|
|
warnx("fdopen failed.");
|
1993-03-21 12:45:37 +03:00
|
|
|
if (cin)
|
1997-03-13 09:23:11 +03:00
|
|
|
(void)fclose(cin);
|
1993-03-21 12:45:37 +03:00
|
|
|
if (cout)
|
1997-03-13 09:23:11 +03:00
|
|
|
(void)fclose(cout);
|
1993-03-21 12:45:37 +03:00
|
|
|
code = -1;
|
|
|
|
goto bad;
|
|
|
|
}
|
|
|
|
if (verbose)
|
1998-06-04 12:28:35 +04:00
|
|
|
fprintf(ttyout, "Connected to %s.\n", hostname);
|
1993-03-21 12:45:37 +03:00
|
|
|
if (getreply(0) > 2) { /* read startup message from server */
|
|
|
|
if (cin)
|
1997-03-13 09:23:11 +03:00
|
|
|
(void)fclose(cin);
|
1993-03-21 12:45:37 +03:00
|
|
|
if (cout)
|
1997-03-13 09:23:11 +03:00
|
|
|
(void)fclose(cout);
|
1993-03-21 12:45:37 +03:00
|
|
|
code = -1;
|
|
|
|
goto bad;
|
|
|
|
}
|
|
|
|
#ifdef SO_OOBINLINE
|
|
|
|
{
|
|
|
|
int on = 1;
|
|
|
|
|
|
|
|
if (setsockopt(s, SOL_SOCKET, SO_OOBINLINE, (char *)&on, sizeof(on))
|
|
|
|
< 0 && debug) {
|
1994-08-25 07:47:50 +04:00
|
|
|
warn("setsockopt");
|
1993-03-21 12:45:37 +03:00
|
|
|
}
|
|
|
|
}
|
|
|
|
#endif /* SO_OOBINLINE */
|
|
|
|
|
|
|
|
return (hostname);
|
|
|
|
bad:
|
1997-03-13 09:23:11 +03:00
|
|
|
(void)close(s);
|
1998-01-18 17:23:33 +03:00
|
|
|
return (NULL);
|
1993-03-21 12:45:37 +03:00
|
|
|
}
|
|
|
|
|
|
|
|
void
|
1997-03-13 09:23:11 +03:00
|
|
|
cmdabort(notused)
|
|
|
|
int notused;
|
1993-03-21 12:45:37 +03:00
|
|
|
{
|
|
|
|
|
[Yet Another Huge Ftp Commit - hopefully the last for a while,
barring any more little things people want added ...]
New features:
* progressmeter is now asynchronous, so "stalled" transfers can be
detected. "- stalled -" is displayed instead of the ETA in this case.
When the xfer resumes, the time that the xfer was stalled for is
factored out of the ETA. It is debatable whether this is better than
not factoring it out, but I like it this way (I.e, if it stalls for 8
seconds and the ETA was 30 seconds, when it resumes the ETA will still
be 30 seconds).
* verbosity can be disabled on the command line (-V), so that in auto-fetch
mode the only lines displayed will be a description of the file, and
the progress bar (if possible)
* if the screen is resized (and detected via the SIGWINCH signal), the
progress bar will rescale automatically.
Bugs fixed:
* progress bar will not use the last character on the line, as this can
cause problems on some terminals
* screen dimensions (via ioctl(TIOCWINSZ)) should use stdout not stdin
* progressmeter() used some vars before initialising them
* ^D will quit now. [fixes bin/3162]
* use hstrerror() to generate error message for host name lookup failure.
* use getcwd instead of getwd (it should have been OK, but why tempt fate?)
* auto-fetch transfers will always return a positive exit value upon failure
or interruption, relative to the file's position in argv[].
* remote completion of / will work, without putting a leading "///".
This is actually a bug in ftpd(1), where "NLST /" prefixes all names
with "//", but fixing every ftpd(1) is not an option...
1997-02-01 13:44:54 +03:00
|
|
|
alarmtimer(0);
|
1998-06-04 12:28:35 +04:00
|
|
|
putc('\n', ttyout);
|
1993-03-21 12:45:37 +03:00
|
|
|
abrtflag++;
|
|
|
|
if (ptflag)
|
1996-11-28 06:12:28 +03:00
|
|
|
longjmp(ptabort, 1);
|
1993-03-21 12:45:37 +03:00
|
|
|
}
|
|
|
|
|
|
|
|
/*VARARGS*/
|
1994-08-25 07:47:50 +04:00
|
|
|
int
|
1997-03-13 09:23:11 +03:00
|
|
|
#ifdef __STDC__
|
|
|
|
command(const char *fmt, ...)
|
|
|
|
#else
|
1993-03-21 12:45:37 +03:00
|
|
|
command(va_alist)
|
1997-03-13 09:23:11 +03:00
|
|
|
va_dcl
|
|
|
|
#endif
|
1993-03-21 12:45:37 +03:00
|
|
|
{
|
|
|
|
va_list ap;
|
|
|
|
int r;
|
|
|
|
sig_t oldintr;
|
1997-03-13 09:23:11 +03:00
|
|
|
#ifndef __STDC__
|
|
|
|
const char *fmt;
|
|
|
|
#endif
|
1993-03-21 12:45:37 +03:00
|
|
|
|
|
|
|
abrtflag = 0;
|
|
|
|
if (debug) {
|
1998-06-04 12:28:35 +04:00
|
|
|
fputs("---> ", ttyout);
|
1997-03-13 09:23:11 +03:00
|
|
|
#ifdef __STDC__
|
|
|
|
va_start(ap, fmt);
|
|
|
|
#else
|
1993-03-21 12:45:37 +03:00
|
|
|
va_start(ap);
|
1997-03-13 09:23:11 +03:00
|
|
|
fmt = va_arg(ap, const char *);
|
|
|
|
#endif
|
1993-03-21 12:45:37 +03:00
|
|
|
if (strncmp("PASS ", fmt, 5) == 0)
|
1998-06-04 12:28:35 +04:00
|
|
|
fputs("PASS XXXX", ttyout);
|
1996-11-25 08:13:18 +03:00
|
|
|
else if (strncmp("ACCT ", fmt, 5) == 0)
|
1998-06-04 12:28:35 +04:00
|
|
|
fputs("ACCT XXXX", ttyout);
|
1996-11-25 08:13:18 +03:00
|
|
|
else
|
1998-06-04 12:28:35 +04:00
|
|
|
vfprintf(ttyout, fmt, ap);
|
1993-03-21 12:45:37 +03:00
|
|
|
va_end(ap);
|
1998-06-04 12:28:35 +04:00
|
|
|
putc('\n', ttyout);
|
1993-03-21 12:45:37 +03:00
|
|
|
}
|
|
|
|
if (cout == NULL) {
|
1997-03-13 09:23:11 +03:00
|
|
|
warnx("No control connection for command.");
|
1993-03-21 12:45:37 +03:00
|
|
|
code = -1;
|
|
|
|
return (0);
|
|
|
|
}
|
|
|
|
oldintr = signal(SIGINT, cmdabort);
|
1997-03-13 09:23:11 +03:00
|
|
|
#ifdef __STDC__
|
|
|
|
va_start(ap, fmt);
|
|
|
|
#else
|
1993-03-21 12:45:37 +03:00
|
|
|
va_start(ap);
|
|
|
|
fmt = va_arg(ap, char *);
|
1997-03-13 09:23:11 +03:00
|
|
|
#endif
|
1993-03-21 12:45:37 +03:00
|
|
|
vfprintf(cout, fmt, ap);
|
|
|
|
va_end(ap);
|
1997-03-13 09:23:11 +03:00
|
|
|
fputs("\r\n", cout);
|
|
|
|
(void)fflush(cout);
|
1993-03-21 12:45:37 +03:00
|
|
|
cpend = 1;
|
|
|
|
r = getreply(!strcmp(fmt, "QUIT"));
|
|
|
|
if (abrtflag && oldintr != SIG_IGN)
|
|
|
|
(*oldintr)(SIGINT);
|
1997-03-13 09:23:11 +03:00
|
|
|
(void)signal(SIGINT, oldintr);
|
1994-08-25 07:47:50 +04:00
|
|
|
return (r);
|
1993-03-21 12:45:37 +03:00
|
|
|
}
|
|
|
|
|
1996-12-06 05:06:46 +03:00
|
|
|
char reply_string[BUFSIZ]; /* first line of previous reply */
|
1993-03-21 12:45:37 +03:00
|
|
|
|
1994-08-25 07:47:50 +04:00
|
|
|
int
|
1993-03-21 12:45:37 +03:00
|
|
|
getreply(expecteof)
|
|
|
|
int expecteof;
|
|
|
|
{
|
1996-12-06 05:06:46 +03:00
|
|
|
char current_line[BUFSIZ]; /* last line of previous reply */
|
|
|
|
int c, n, line;
|
1994-08-25 07:47:50 +04:00
|
|
|
int dig;
|
1993-03-21 12:45:37 +03:00
|
|
|
int originalcode = 0, continuation = 0;
|
|
|
|
sig_t oldintr;
|
|
|
|
int pflag = 0;
|
1994-08-25 07:47:50 +04:00
|
|
|
char *cp, *pt = pasv;
|
1993-03-21 12:45:37 +03:00
|
|
|
|
|
|
|
oldintr = signal(SIGINT, cmdabort);
|
1996-12-06 05:06:46 +03:00
|
|
|
for (line = 0 ;; line++) {
|
1993-03-21 12:45:37 +03:00
|
|
|
dig = n = code = 0;
|
1996-12-06 05:06:46 +03:00
|
|
|
cp = current_line;
|
1993-03-21 12:45:37 +03:00
|
|
|
while ((c = getc(cin)) != '\n') {
|
|
|
|
if (c == IAC) { /* handle telnet commands */
|
|
|
|
switch (c = getc(cin)) {
|
|
|
|
case WILL:
|
|
|
|
case WONT:
|
|
|
|
c = getc(cin);
|
|
|
|
fprintf(cout, "%c%c%c", IAC, DONT, c);
|
1997-03-13 09:23:11 +03:00
|
|
|
(void)fflush(cout);
|
1993-03-21 12:45:37 +03:00
|
|
|
break;
|
|
|
|
case DO:
|
|
|
|
case DONT:
|
|
|
|
c = getc(cin);
|
|
|
|
fprintf(cout, "%c%c%c", IAC, WONT, c);
|
1997-03-13 09:23:11 +03:00
|
|
|
(void)fflush(cout);
|
1993-03-21 12:45:37 +03:00
|
|
|
break;
|
|
|
|
default:
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
dig++;
|
|
|
|
if (c == EOF) {
|
|
|
|
if (expecteof) {
|
1997-03-13 09:23:11 +03:00
|
|
|
(void)signal(SIGINT, oldintr);
|
1993-03-21 12:45:37 +03:00
|
|
|
code = 221;
|
|
|
|
return (0);
|
|
|
|
}
|
|
|
|
lostpeer();
|
|
|
|
if (verbose) {
|
1998-06-04 12:28:35 +04:00
|
|
|
fputs(
|
|
|
|
"421 Service not available, remote server has closed connection.\n",
|
|
|
|
ttyout);
|
1993-03-21 12:45:37 +03:00
|
|
|
}
|
|
|
|
code = 421;
|
1994-08-25 07:47:50 +04:00
|
|
|
return (4);
|
1993-03-21 12:45:37 +03:00
|
|
|
}
|
|
|
|
if (c != '\r' && (verbose > 0 ||
|
1998-06-04 12:28:35 +04:00
|
|
|
((verbose > -1 && n == '5' && dig > 4) &&
|
|
|
|
(((!n && c < '5') || (n && n < '5'))
|
|
|
|
|| !retry_connect)))) {
|
1993-03-21 12:45:37 +03:00
|
|
|
if (proxflag &&
|
1996-12-06 05:06:46 +03:00
|
|
|
(dig == 1 || (dig == 5 && verbose == 0)))
|
1998-06-04 12:28:35 +04:00
|
|
|
fprintf(ttyout, "%s:", hostname);
|
|
|
|
(void)putc(c, ttyout);
|
1993-03-21 12:45:37 +03:00
|
|
|
}
|
|
|
|
if (dig < 4 && isdigit(c))
|
|
|
|
code = code * 10 + (c - '0');
|
1999-07-02 12:07:40 +04:00
|
|
|
if (!pflag && (code == 227 || code == 228))
|
1993-03-21 12:45:37 +03:00
|
|
|
pflag = 1;
|
1999-07-02 12:07:40 +04:00
|
|
|
else if (!pflag && code == 229)
|
|
|
|
pflag = 100;
|
1993-03-21 12:45:37 +03:00
|
|
|
if (dig > 4 && pflag == 1 && isdigit(c))
|
|
|
|
pflag = 2;
|
|
|
|
if (pflag == 2) {
|
|
|
|
if (c != '\r' && c != ')')
|
|
|
|
*pt++ = c;
|
|
|
|
else {
|
|
|
|
*pt = '\0';
|
|
|
|
pflag = 3;
|
|
|
|
}
|
|
|
|
}
|
1999-07-02 12:07:40 +04:00
|
|
|
if (pflag == 100 && c == '(')
|
|
|
|
pflag = 2;
|
1993-03-21 12:45:37 +03:00
|
|
|
if (dig == 4 && c == '-') {
|
|
|
|
if (continuation)
|
|
|
|
code = 0;
|
|
|
|
continuation++;
|
|
|
|
}
|
|
|
|
if (n == 0)
|
|
|
|
n = c;
|
1996-12-06 05:06:46 +03:00
|
|
|
if (cp < ¤t_line[sizeof(current_line) - 1])
|
1993-03-21 12:45:37 +03:00
|
|
|
*cp++ = c;
|
|
|
|
}
|
1998-06-04 12:28:35 +04:00
|
|
|
if (verbose > 0 || ((verbose > -1 && n == '5') &&
|
|
|
|
(n < '5' || !retry_connect))) {
|
|
|
|
(void)putc(c, ttyout);
|
|
|
|
(void)fflush (ttyout);
|
1993-03-21 12:45:37 +03:00
|
|
|
}
|
1996-12-25 19:02:06 +03:00
|
|
|
if (line == 0) {
|
|
|
|
size_t len = cp - current_line;
|
|
|
|
|
|
|
|
if (len > sizeof(reply_string))
|
|
|
|
len = sizeof(reply_string);
|
|
|
|
|
1997-03-13 09:23:11 +03:00
|
|
|
(void)strncpy(reply_string, current_line, len);
|
1996-12-25 19:02:06 +03:00
|
|
|
reply_string[len] = '\0';
|
|
|
|
}
|
1993-03-21 12:45:37 +03:00
|
|
|
if (continuation && code != originalcode) {
|
|
|
|
if (originalcode == 0)
|
|
|
|
originalcode = code;
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
*cp = '\0';
|
|
|
|
if (n != '1')
|
|
|
|
cpend = 0;
|
1997-03-13 09:23:11 +03:00
|
|
|
(void)signal(SIGINT, oldintr);
|
1993-03-21 12:45:37 +03:00
|
|
|
if (code == 421 || originalcode == 421)
|
|
|
|
lostpeer();
|
|
|
|
if (abrtflag && oldintr != cmdabort && oldintr != SIG_IGN)
|
|
|
|
(*oldintr)(SIGINT);
|
|
|
|
return (n - '0');
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
1999-06-24 18:50:56 +04:00
|
|
|
static int
|
|
|
|
empty(cin, din, sec)
|
|
|
|
FILE *cin;
|
|
|
|
FILE *din;
|
1993-03-21 12:45:37 +03:00
|
|
|
int sec;
|
|
|
|
{
|
1999-06-24 18:50:56 +04:00
|
|
|
int nr;
|
|
|
|
int nfd = 0;
|
|
|
|
|
|
|
|
#ifdef __USE_SELECT
|
1993-03-21 12:45:37 +03:00
|
|
|
struct timeval t;
|
1999-06-24 18:50:56 +04:00
|
|
|
fd_set rmask;
|
1993-03-21 12:45:37 +03:00
|
|
|
|
1999-06-24 18:50:56 +04:00
|
|
|
FD_ZERO(&cin);
|
|
|
|
if (cin) {
|
|
|
|
if (nfd < fileno(cin))
|
|
|
|
nfd = fileno(cin);
|
|
|
|
FD_SET(fileno(cin), &rmask);
|
|
|
|
}
|
|
|
|
if (din) {
|
|
|
|
if (nfd < fileno(din))
|
|
|
|
nfd = fileno(din);
|
|
|
|
FD_SET(fileno(din), &rmask);
|
|
|
|
}
|
|
|
|
|
1993-03-21 12:45:37 +03:00
|
|
|
t.tv_sec = (long) sec;
|
|
|
|
t.tv_usec = 0;
|
1999-06-24 18:50:56 +04:00
|
|
|
if ((nr = select(nfd, &rmask, NULL, NULL, &t)) <= 0)
|
|
|
|
return nr;
|
|
|
|
|
|
|
|
nr = 0;
|
|
|
|
if (cin)
|
|
|
|
nr |= FD_ISSET(fileno(cin), &rmask) ? 1 : 0;
|
|
|
|
if (din)
|
|
|
|
nr |= FD_ISSET(fileno(din), &rmask) ? 2 : 0;
|
|
|
|
|
|
|
|
#else
|
|
|
|
struct pollfd pfd[2];
|
|
|
|
|
|
|
|
if (cin) {
|
|
|
|
pfd[nfd].fd = fileno(cin);
|
|
|
|
pfd[nfd++].events = POLLIN;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (din) {
|
|
|
|
pfd[nfd].fd = fileno(din);
|
|
|
|
pfd[nfd++].events = POLLIN;
|
|
|
|
}
|
|
|
|
|
|
|
|
if ((nr = poll(pfd, nfd, sec * 1000)) <= 0)
|
|
|
|
return nr;
|
|
|
|
|
|
|
|
nr = 0;
|
|
|
|
nfd = 0;
|
|
|
|
if (cin)
|
|
|
|
nr |= (pfd[nfd++].revents & POLLIN) ? 1 : 0;
|
|
|
|
if (din)
|
|
|
|
nr |= (pfd[nfd++].revents & POLLIN) ? 2 : 0;
|
|
|
|
#endif
|
|
|
|
return nr;
|
1993-03-21 12:45:37 +03:00
|
|
|
}
|
|
|
|
|
|
|
|
jmp_buf sendabort;
|
|
|
|
|
|
|
|
void
|
1997-03-13 09:23:11 +03:00
|
|
|
abortsend(notused)
|
|
|
|
int notused;
|
1993-03-21 12:45:37 +03:00
|
|
|
{
|
|
|
|
|
[Yet Another Huge Ftp Commit - hopefully the last for a while,
barring any more little things people want added ...]
New features:
* progressmeter is now asynchronous, so "stalled" transfers can be
detected. "- stalled -" is displayed instead of the ETA in this case.
When the xfer resumes, the time that the xfer was stalled for is
factored out of the ETA. It is debatable whether this is better than
not factoring it out, but I like it this way (I.e, if it stalls for 8
seconds and the ETA was 30 seconds, when it resumes the ETA will still
be 30 seconds).
* verbosity can be disabled on the command line (-V), so that in auto-fetch
mode the only lines displayed will be a description of the file, and
the progress bar (if possible)
* if the screen is resized (and detected via the SIGWINCH signal), the
progress bar will rescale automatically.
Bugs fixed:
* progress bar will not use the last character on the line, as this can
cause problems on some terminals
* screen dimensions (via ioctl(TIOCWINSZ)) should use stdout not stdin
* progressmeter() used some vars before initialising them
* ^D will quit now. [fixes bin/3162]
* use hstrerror() to generate error message for host name lookup failure.
* use getcwd instead of getwd (it should have been OK, but why tempt fate?)
* auto-fetch transfers will always return a positive exit value upon failure
or interruption, relative to the file's position in argv[].
* remote completion of / will work, without putting a leading "///".
This is actually a bug in ftpd(1), where "NLST /" prefixes all names
with "//", but fixing every ftpd(1) is not an option...
1997-02-01 13:44:54 +03:00
|
|
|
alarmtimer(0);
|
1993-03-21 12:45:37 +03:00
|
|
|
mflag = 0;
|
|
|
|
abrtflag = 0;
|
1998-06-04 12:28:35 +04:00
|
|
|
fputs("\nsend aborted\nwaiting for remote to finish abort.\n", ttyout);
|
1993-03-21 12:45:37 +03:00
|
|
|
longjmp(sendabort, 1);
|
|
|
|
}
|
|
|
|
|
1994-08-25 07:47:50 +04:00
|
|
|
void
|
1993-03-21 12:45:37 +03:00
|
|
|
sendrequest(cmd, local, remote, printnames)
|
1996-11-28 06:12:28 +03:00
|
|
|
const char *cmd, *local, *remote;
|
1993-03-21 12:45:37 +03:00
|
|
|
int printnames;
|
|
|
|
{
|
|
|
|
struct stat st;
|
1994-08-25 07:47:50 +04:00
|
|
|
int c, d;
|
1997-07-20 13:45:35 +04:00
|
|
|
FILE *fin, *dout;
|
1994-08-25 07:47:50 +04:00
|
|
|
int (*closefunc) __P((FILE *));
|
1996-11-25 08:13:18 +03:00
|
|
|
sig_t oldinti, oldintr, oldintp;
|
1997-07-20 13:45:35 +04:00
|
|
|
volatile off_t hashbytes;
|
1993-03-21 12:45:37 +03:00
|
|
|
char *lmode, buf[BUFSIZ], *bufp;
|
1997-03-13 09:23:11 +03:00
|
|
|
int oprogress;
|
1993-03-21 12:45:37 +03:00
|
|
|
|
1998-06-04 12:28:35 +04:00
|
|
|
#ifdef __GNUC__ /* to shut up gcc warnings */
|
1997-07-20 13:45:35 +04:00
|
|
|
(void)&fin;
|
|
|
|
(void)&dout;
|
|
|
|
(void)&closefunc;
|
|
|
|
(void)&oldinti;
|
|
|
|
(void)&oldintr;
|
|
|
|
(void)&oldintp;
|
|
|
|
(void)&lmode;
|
|
|
|
#endif
|
|
|
|
|
1996-12-06 05:06:46 +03:00
|
|
|
hashbytes = mark;
|
1996-11-25 08:13:18 +03:00
|
|
|
direction = "sent";
|
1997-07-20 13:45:35 +04:00
|
|
|
dout = NULL;
|
1996-11-25 08:13:18 +03:00
|
|
|
bytes = 0;
|
1996-12-06 05:06:46 +03:00
|
|
|
filesize = -1;
|
1997-03-13 09:23:11 +03:00
|
|
|
oprogress = progress;
|
1993-03-21 12:45:37 +03:00
|
|
|
if (verbose && printnames) {
|
|
|
|
if (local && *local != '-')
|
1998-06-04 12:28:35 +04:00
|
|
|
fprintf(ttyout, "local: %s ", local);
|
1993-03-21 12:45:37 +03:00
|
|
|
if (remote)
|
1998-06-04 12:28:35 +04:00
|
|
|
fprintf(ttyout, "remote: %s\n", remote);
|
1993-03-21 12:45:37 +03:00
|
|
|
}
|
|
|
|
if (proxy) {
|
|
|
|
proxtrans(cmd, local, remote);
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
if (curtype != type)
|
|
|
|
changetype(type, 0);
|
|
|
|
closefunc = NULL;
|
|
|
|
oldintr = NULL;
|
|
|
|
oldintp = NULL;
|
1996-11-25 08:13:18 +03:00
|
|
|
oldinti = NULL;
|
1993-03-21 12:45:37 +03:00
|
|
|
lmode = "w";
|
|
|
|
if (setjmp(sendabort)) {
|
|
|
|
while (cpend) {
|
1997-03-13 09:23:11 +03:00
|
|
|
(void)getreply(0);
|
1993-03-21 12:45:37 +03:00
|
|
|
}
|
|
|
|
if (data >= 0) {
|
1997-03-13 09:23:11 +03:00
|
|
|
(void)close(data);
|
1993-03-21 12:45:37 +03:00
|
|
|
data = -1;
|
|
|
|
}
|
|
|
|
if (oldintr)
|
1997-03-13 09:23:11 +03:00
|
|
|
(void)signal(SIGINT, oldintr);
|
1993-03-21 12:45:37 +03:00
|
|
|
if (oldintp)
|
1997-03-13 09:23:11 +03:00
|
|
|
(void)signal(SIGPIPE, oldintp);
|
1996-11-25 08:13:18 +03:00
|
|
|
if (oldinti)
|
1998-08-08 10:46:01 +04:00
|
|
|
(void)xsignal(SIGINFO, oldinti);
|
1993-03-21 12:45:37 +03:00
|
|
|
code = -1;
|
1997-11-01 17:36:49 +03:00
|
|
|
goto cleanupsend;
|
1993-03-21 12:45:37 +03:00
|
|
|
}
|
|
|
|
oldintr = signal(SIGINT, abortsend);
|
1998-08-08 10:46:01 +04:00
|
|
|
oldinti = xsignal(SIGINFO, psummary);
|
1997-03-13 09:23:11 +03:00
|
|
|
if (strcmp(local, "-") == 0) {
|
1993-03-21 12:45:37 +03:00
|
|
|
fin = stdin;
|
1997-03-13 09:23:11 +03:00
|
|
|
progress = 0;
|
|
|
|
} else if (*local == '|') {
|
1996-11-28 06:12:28 +03:00
|
|
|
oldintp = signal(SIGPIPE, SIG_IGN);
|
1993-03-21 12:45:37 +03:00
|
|
|
fin = popen(local + 1, "r");
|
|
|
|
if (fin == NULL) {
|
1994-08-25 07:47:50 +04:00
|
|
|
warn("%s", local + 1);
|
1997-03-13 09:23:11 +03:00
|
|
|
(void)signal(SIGINT, oldintr);
|
|
|
|
(void)signal(SIGPIPE, oldintp);
|
1998-08-08 10:46:01 +04:00
|
|
|
(void)xsignal(SIGINFO, oldinti);
|
1993-03-21 12:45:37 +03:00
|
|
|
code = -1;
|
1997-11-01 17:36:49 +03:00
|
|
|
goto cleanupsend;
|
1993-03-21 12:45:37 +03:00
|
|
|
}
|
1997-03-13 09:23:11 +03:00
|
|
|
progress = 0;
|
1993-03-21 12:45:37 +03:00
|
|
|
closefunc = pclose;
|
|
|
|
} else {
|
|
|
|
fin = fopen(local, "r");
|
|
|
|
if (fin == NULL) {
|
1994-08-25 07:47:50 +04:00
|
|
|
warn("local: %s", local);
|
1997-03-13 09:23:11 +03:00
|
|
|
(void)signal(SIGINT, oldintr);
|
1998-08-08 10:46:01 +04:00
|
|
|
(void)xsignal(SIGINFO, oldinti);
|
1993-03-21 12:45:37 +03:00
|
|
|
code = -1;
|
1997-11-01 17:36:49 +03:00
|
|
|
goto cleanupsend;
|
1993-03-21 12:45:37 +03:00
|
|
|
}
|
|
|
|
closefunc = fclose;
|
1997-10-19 23:09:05 +04:00
|
|
|
if (fstat(fileno(fin), &st) < 0 || !S_ISREG(st.st_mode)) {
|
1998-06-04 12:28:35 +04:00
|
|
|
fprintf(ttyout, "%s: not a plain file.\n", local);
|
1997-03-13 09:23:11 +03:00
|
|
|
(void)signal(SIGINT, oldintr);
|
1998-08-08 10:46:01 +04:00
|
|
|
(void)xsignal(SIGINFO, oldinti);
|
1993-03-21 12:45:37 +03:00
|
|
|
fclose(fin);
|
|
|
|
code = -1;
|
1997-11-01 17:36:49 +03:00
|
|
|
goto cleanupsend;
|
1993-03-21 12:45:37 +03:00
|
|
|
}
|
1996-12-06 05:06:46 +03:00
|
|
|
filesize = st.st_size;
|
1993-03-21 12:45:37 +03:00
|
|
|
}
|
|
|
|
if (initconn()) {
|
1997-03-13 09:23:11 +03:00
|
|
|
(void)signal(SIGINT, oldintr);
|
1998-08-08 10:46:01 +04:00
|
|
|
(void)xsignal(SIGINFO, oldinti);
|
1993-03-21 12:45:37 +03:00
|
|
|
if (oldintp)
|
1997-03-13 09:23:11 +03:00
|
|
|
(void)signal(SIGPIPE, oldintp);
|
1993-03-21 12:45:37 +03:00
|
|
|
code = -1;
|
|
|
|
if (closefunc != NULL)
|
|
|
|
(*closefunc)(fin);
|
1997-11-01 17:36:49 +03:00
|
|
|
goto cleanupsend;
|
1993-03-21 12:45:37 +03:00
|
|
|
}
|
|
|
|
if (setjmp(sendabort))
|
|
|
|
goto abort;
|
|
|
|
|
|
|
|
if (restart_point &&
|
|
|
|
(strcmp(cmd, "STOR") == 0 || strcmp(cmd, "APPE") == 0)) {
|
1994-08-25 07:47:50 +04:00
|
|
|
int rc;
|
|
|
|
|
1997-01-19 17:19:02 +03:00
|
|
|
rc = -1;
|
1994-08-25 07:47:50 +04:00
|
|
|
switch (curtype) {
|
|
|
|
case TYPE_A:
|
|
|
|
rc = fseek(fin, (long) restart_point, SEEK_SET);
|
|
|
|
break;
|
|
|
|
case TYPE_I:
|
|
|
|
case TYPE_L:
|
|
|
|
rc = lseek(fileno(fin), restart_point, SEEK_SET);
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
if (rc < 0) {
|
|
|
|
warn("local: %s", local);
|
1993-03-21 12:45:37 +03:00
|
|
|
if (closefunc != NULL)
|
|
|
|
(*closefunc)(fin);
|
1997-11-01 17:36:49 +03:00
|
|
|
goto cleanupsend;
|
1993-03-21 12:45:37 +03:00
|
|
|
}
|
1998-05-20 04:54:52 +04:00
|
|
|
#ifndef NO_QUAD
|
1997-11-01 17:36:49 +03:00
|
|
|
if (command("REST %qd", (long long) restart_point) !=
|
1998-05-20 04:54:52 +04:00
|
|
|
#else
|
|
|
|
if (command("REST %ld", (long) restart_point) !=
|
|
|
|
#endif
|
1997-11-01 17:36:49 +03:00
|
|
|
CONTINUE) {
|
1993-03-21 12:45:37 +03:00
|
|
|
if (closefunc != NULL)
|
|
|
|
(*closefunc)(fin);
|
1997-11-01 17:36:49 +03:00
|
|
|
goto cleanupsend;
|
1993-03-21 12:45:37 +03:00
|
|
|
}
|
|
|
|
lmode = "r+w";
|
|
|
|
}
|
|
|
|
if (remote) {
|
|
|
|
if (command("%s %s", cmd, remote) != PRELIM) {
|
1997-03-13 09:23:11 +03:00
|
|
|
(void)signal(SIGINT, oldintr);
|
1998-08-08 10:46:01 +04:00
|
|
|
(void)xsignal(SIGINFO, oldinti);
|
1993-03-21 12:45:37 +03:00
|
|
|
if (oldintp)
|
1997-03-13 09:23:11 +03:00
|
|
|
(void)signal(SIGPIPE, oldintp);
|
1993-03-21 12:45:37 +03:00
|
|
|
if (closefunc != NULL)
|
|
|
|
(*closefunc)(fin);
|
1997-11-01 17:36:49 +03:00
|
|
|
goto cleanupsend;
|
1993-03-21 12:45:37 +03:00
|
|
|
}
|
|
|
|
} else
|
|
|
|
if (command("%s", cmd) != PRELIM) {
|
1997-03-13 09:23:11 +03:00
|
|
|
(void)signal(SIGINT, oldintr);
|
1998-08-08 10:46:01 +04:00
|
|
|
(void)xsignal(SIGINFO, oldinti);
|
1993-03-21 12:45:37 +03:00
|
|
|
if (oldintp)
|
1997-03-13 09:23:11 +03:00
|
|
|
(void)signal(SIGPIPE, oldintp);
|
1993-03-21 12:45:37 +03:00
|
|
|
if (closefunc != NULL)
|
|
|
|
(*closefunc)(fin);
|
1997-11-01 17:36:49 +03:00
|
|
|
goto cleanupsend;
|
1993-03-21 12:45:37 +03:00
|
|
|
}
|
|
|
|
dout = dataconn(lmode);
|
|
|
|
if (dout == NULL)
|
|
|
|
goto abort;
|
1996-12-06 05:06:46 +03:00
|
|
|
progressmeter(-1);
|
1993-03-21 12:45:37 +03:00
|
|
|
oldintp = signal(SIGPIPE, SIG_IGN);
|
|
|
|
switch (curtype) {
|
|
|
|
|
|
|
|
case TYPE_I:
|
|
|
|
case TYPE_L:
|
[fear this; more ftp hacking from lukem :-]
features:
---------
* transfer rate throttling with the new `rate' command. syntax:
rate direction [max [incr]]
where direction is `all', `get' or `put'.
if max is not supplied, the current settings are displayed.
if max is supplied, then transfers in the given direction will
be throttled to this value.
if incr is supplied, the increment for the `on-the-fly' scaling
will be set to that, otherwise `1024' is used.
currently implemented for binary get, binary put, and url fetches.
not yet supported for ascii get or put, or local file copies.
* on-the-fly scaling of the throttle based on signals:
- SIGUSR1 raises the throttle rate by the increment for that direction
- SIGUSR2 lowers the throttle rate by the increment for that direction
* -T dir,max[,incr] option to set rate from the command line
* `k', `m', `g' suffix support for bytecounts in the `hash', `rate',
`rcvbuf' and `sndbuf' commands)
bug fixes and code mods:
------------------------
* fix up ftp_login() so that ruserpass() is always called, even for
command-line url fetches.
* implement strsuftoi(), which parses a given number into a int with
suffix support. replaces getsockbufsize()
* implement parserate(), which does the argv parsing for -T and rate
* save and restore errno in signal handlers (may not be necessary, but
it doesn't hurt)
notes:
------
the rate command has had reasonable testing, but I'd like feedback
if it doesn't do the right thing, especially from people on slower
(i.e, modem) links.
I haven't tested the rate throttle against a http server which does
`transfer-encoding: chunked' because I couldn't find a server to
test against.
1999-06-29 14:43:16 +04:00
|
|
|
while (1) {
|
|
|
|
struct timeval then, now, td;
|
|
|
|
off_t bufrem, bufsize;
|
|
|
|
|
|
|
|
bufsize = sizeof(buf);
|
|
|
|
(void)gettimeofday(&then, NULL);
|
|
|
|
errno = c = d = 0;
|
|
|
|
bufrem = rate_put ? rate_put : bufsize;
|
|
|
|
while (bufrem > 0) {
|
|
|
|
if ((c = read(fileno(fin), buf,
|
|
|
|
MIN(bufsize, bufrem))) <= 0)
|
|
|
|
goto senddone;
|
|
|
|
bytes += c;
|
|
|
|
bufrem -= c;
|
|
|
|
for (bufp = buf; c > 0; c -= d, bufp += d)
|
|
|
|
if ((d = write(fileno(dout), bufp, c))
|
|
|
|
<= 0)
|
|
|
|
break;
|
|
|
|
if (d < 0)
|
|
|
|
goto senddone;
|
|
|
|
if (hash && (!progress || filesize < 0) ) {
|
|
|
|
while (bytes >= hashbytes) {
|
|
|
|
(void)putc('#', ttyout);
|
|
|
|
hashbytes += mark;
|
|
|
|
}
|
|
|
|
(void)fflush(ttyout);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if (rate_put) {
|
|
|
|
while (1) {
|
|
|
|
(void)gettimeofday(&now, NULL);
|
|
|
|
timersub(&now, &then, &td);
|
|
|
|
if (td.tv_sec > 0)
|
|
|
|
break;
|
|
|
|
usleep(1000000 - td.tv_usec);
|
1993-03-21 12:45:37 +03:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
[fear this; more ftp hacking from lukem :-]
features:
---------
* transfer rate throttling with the new `rate' command. syntax:
rate direction [max [incr]]
where direction is `all', `get' or `put'.
if max is not supplied, the current settings are displayed.
if max is supplied, then transfers in the given direction will
be throttled to this value.
if incr is supplied, the increment for the `on-the-fly' scaling
will be set to that, otherwise `1024' is used.
currently implemented for binary get, binary put, and url fetches.
not yet supported for ascii get or put, or local file copies.
* on-the-fly scaling of the throttle based on signals:
- SIGUSR1 raises the throttle rate by the increment for that direction
- SIGUSR2 lowers the throttle rate by the increment for that direction
* -T dir,max[,incr] option to set rate from the command line
* `k', `m', `g' suffix support for bytecounts in the `hash', `rate',
`rcvbuf' and `sndbuf' commands)
bug fixes and code mods:
------------------------
* fix up ftp_login() so that ruserpass() is always called, even for
command-line url fetches.
* implement strsuftoi(), which parses a given number into a int with
suffix support. replaces getsockbufsize()
* implement parserate(), which does the argv parsing for -T and rate
* save and restore errno in signal handlers (may not be necessary, but
it doesn't hurt)
notes:
------
the rate command has had reasonable testing, but I'd like feedback
if it doesn't do the right thing, especially from people on slower
(i.e, modem) links.
I haven't tested the rate throttle against a http server which does
`transfer-encoding: chunked' because I couldn't find a server to
test against.
1999-06-29 14:43:16 +04:00
|
|
|
senddone:
|
[Yet Another Huge Ftp Commit - hopefully the last for a while,
barring any more little things people want added ...]
New features:
* progressmeter is now asynchronous, so "stalled" transfers can be
detected. "- stalled -" is displayed instead of the ETA in this case.
When the xfer resumes, the time that the xfer was stalled for is
factored out of the ETA. It is debatable whether this is better than
not factoring it out, but I like it this way (I.e, if it stalls for 8
seconds and the ETA was 30 seconds, when it resumes the ETA will still
be 30 seconds).
* verbosity can be disabled on the command line (-V), so that in auto-fetch
mode the only lines displayed will be a description of the file, and
the progress bar (if possible)
* if the screen is resized (and detected via the SIGWINCH signal), the
progress bar will rescale automatically.
Bugs fixed:
* progress bar will not use the last character on the line, as this can
cause problems on some terminals
* screen dimensions (via ioctl(TIOCWINSZ)) should use stdout not stdin
* progressmeter() used some vars before initialising them
* ^D will quit now. [fixes bin/3162]
* use hstrerror() to generate error message for host name lookup failure.
* use getcwd instead of getwd (it should have been OK, but why tempt fate?)
* auto-fetch transfers will always return a positive exit value upon failure
or interruption, relative to the file's position in argv[].
* remote completion of / will work, without putting a leading "///".
This is actually a bug in ftpd(1), where "NLST /" prefixes all names
with "//", but fixing every ftpd(1) is not an option...
1997-02-01 13:44:54 +03:00
|
|
|
if (hash && (!progress || filesize < 0) && bytes > 0) {
|
1996-11-25 08:13:18 +03:00
|
|
|
if (bytes < mark)
|
1998-06-04 12:28:35 +04:00
|
|
|
(void)putc('#', ttyout);
|
|
|
|
(void)putc('\n', ttyout);
|
1993-03-21 12:45:37 +03:00
|
|
|
}
|
|
|
|
if (c < 0)
|
1994-08-25 07:47:50 +04:00
|
|
|
warn("local: %s", local);
|
1993-03-21 12:45:37 +03:00
|
|
|
if (d < 0) {
|
1996-11-25 08:13:18 +03:00
|
|
|
if (errno != EPIPE)
|
1994-08-25 07:47:50 +04:00
|
|
|
warn("netout");
|
1993-03-21 12:45:37 +03:00
|
|
|
bytes = -1;
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
|
|
|
|
case TYPE_A:
|
|
|
|
while ((c = getc(fin)) != EOF) {
|
|
|
|
if (c == '\n') {
|
[Yet Another Huge Ftp Commit - hopefully the last for a while,
barring any more little things people want added ...]
New features:
* progressmeter is now asynchronous, so "stalled" transfers can be
detected. "- stalled -" is displayed instead of the ETA in this case.
When the xfer resumes, the time that the xfer was stalled for is
factored out of the ETA. It is debatable whether this is better than
not factoring it out, but I like it this way (I.e, if it stalls for 8
seconds and the ETA was 30 seconds, when it resumes the ETA will still
be 30 seconds).
* verbosity can be disabled on the command line (-V), so that in auto-fetch
mode the only lines displayed will be a description of the file, and
the progress bar (if possible)
* if the screen is resized (and detected via the SIGWINCH signal), the
progress bar will rescale automatically.
Bugs fixed:
* progress bar will not use the last character on the line, as this can
cause problems on some terminals
* screen dimensions (via ioctl(TIOCWINSZ)) should use stdout not stdin
* progressmeter() used some vars before initialising them
* ^D will quit now. [fixes bin/3162]
* use hstrerror() to generate error message for host name lookup failure.
* use getcwd instead of getwd (it should have been OK, but why tempt fate?)
* auto-fetch transfers will always return a positive exit value upon failure
or interruption, relative to the file's position in argv[].
* remote completion of / will work, without putting a leading "///".
This is actually a bug in ftpd(1), where "NLST /" prefixes all names
with "//", but fixing every ftpd(1) is not an option...
1997-02-01 13:44:54 +03:00
|
|
|
while (hash && (!progress || filesize < 0) &&
|
1996-12-06 05:06:46 +03:00
|
|
|
(bytes >= hashbytes)) {
|
1998-06-04 12:28:35 +04:00
|
|
|
(void)putc('#', ttyout);
|
|
|
|
(void)fflush(ttyout);
|
1996-11-25 08:13:18 +03:00
|
|
|
hashbytes += mark;
|
1993-03-21 12:45:37 +03:00
|
|
|
}
|
|
|
|
if (ferror(dout))
|
|
|
|
break;
|
1997-03-13 09:23:11 +03:00
|
|
|
(void)putc('\r', dout);
|
1993-03-21 12:45:37 +03:00
|
|
|
bytes++;
|
|
|
|
}
|
1997-03-13 09:23:11 +03:00
|
|
|
(void)putc(c, dout);
|
1993-03-21 12:45:37 +03:00
|
|
|
bytes++;
|
1996-12-06 05:06:46 +03:00
|
|
|
#if 0 /* this violates RFC */
|
|
|
|
if (c == '\r') {
|
|
|
|
(void)putc('\0', dout);
|
|
|
|
bytes++;
|
|
|
|
}
|
|
|
|
#endif
|
1993-03-21 12:45:37 +03:00
|
|
|
}
|
[Yet Another Huge Ftp Commit - hopefully the last for a while,
barring any more little things people want added ...]
New features:
* progressmeter is now asynchronous, so "stalled" transfers can be
detected. "- stalled -" is displayed instead of the ETA in this case.
When the xfer resumes, the time that the xfer was stalled for is
factored out of the ETA. It is debatable whether this is better than
not factoring it out, but I like it this way (I.e, if it stalls for 8
seconds and the ETA was 30 seconds, when it resumes the ETA will still
be 30 seconds).
* verbosity can be disabled on the command line (-V), so that in auto-fetch
mode the only lines displayed will be a description of the file, and
the progress bar (if possible)
* if the screen is resized (and detected via the SIGWINCH signal), the
progress bar will rescale automatically.
Bugs fixed:
* progress bar will not use the last character on the line, as this can
cause problems on some terminals
* screen dimensions (via ioctl(TIOCWINSZ)) should use stdout not stdin
* progressmeter() used some vars before initialising them
* ^D will quit now. [fixes bin/3162]
* use hstrerror() to generate error message for host name lookup failure.
* use getcwd instead of getwd (it should have been OK, but why tempt fate?)
* auto-fetch transfers will always return a positive exit value upon failure
or interruption, relative to the file's position in argv[].
* remote completion of / will work, without putting a leading "///".
This is actually a bug in ftpd(1), where "NLST /" prefixes all names
with "//", but fixing every ftpd(1) is not an option...
1997-02-01 13:44:54 +03:00
|
|
|
if (hash && (!progress || filesize < 0)) {
|
1993-03-21 12:45:37 +03:00
|
|
|
if (bytes < hashbytes)
|
1998-06-04 12:28:35 +04:00
|
|
|
(void)putc('#', ttyout);
|
|
|
|
(void)putc('\n', ttyout);
|
1993-03-21 12:45:37 +03:00
|
|
|
}
|
|
|
|
if (ferror(fin))
|
1994-08-25 07:47:50 +04:00
|
|
|
warn("local: %s", local);
|
1993-03-21 12:45:37 +03:00
|
|
|
if (ferror(dout)) {
|
|
|
|
if (errno != EPIPE)
|
1994-08-25 07:47:50 +04:00
|
|
|
warn("netout");
|
1993-03-21 12:45:37 +03:00
|
|
|
bytes = -1;
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
}
|
[Yet Another Huge Ftp Commit - hopefully the last for a while,
barring any more little things people want added ...]
New features:
* progressmeter is now asynchronous, so "stalled" transfers can be
detected. "- stalled -" is displayed instead of the ETA in this case.
When the xfer resumes, the time that the xfer was stalled for is
factored out of the ETA. It is debatable whether this is better than
not factoring it out, but I like it this way (I.e, if it stalls for 8
seconds and the ETA was 30 seconds, when it resumes the ETA will still
be 30 seconds).
* verbosity can be disabled on the command line (-V), so that in auto-fetch
mode the only lines displayed will be a description of the file, and
the progress bar (if possible)
* if the screen is resized (and detected via the SIGWINCH signal), the
progress bar will rescale automatically.
Bugs fixed:
* progress bar will not use the last character on the line, as this can
cause problems on some terminals
* screen dimensions (via ioctl(TIOCWINSZ)) should use stdout not stdin
* progressmeter() used some vars before initialising them
* ^D will quit now. [fixes bin/3162]
* use hstrerror() to generate error message for host name lookup failure.
* use getcwd instead of getwd (it should have been OK, but why tempt fate?)
* auto-fetch transfers will always return a positive exit value upon failure
or interruption, relative to the file's position in argv[].
* remote completion of / will work, without putting a leading "///".
This is actually a bug in ftpd(1), where "NLST /" prefixes all names
with "//", but fixing every ftpd(1) is not an option...
1997-02-01 13:44:54 +03:00
|
|
|
progressmeter(1);
|
1993-03-21 12:45:37 +03:00
|
|
|
if (closefunc != NULL)
|
|
|
|
(*closefunc)(fin);
|
1997-03-13 09:23:11 +03:00
|
|
|
(void)fclose(dout);
|
|
|
|
(void)getreply(0);
|
|
|
|
(void)signal(SIGINT, oldintr);
|
1998-08-08 10:46:01 +04:00
|
|
|
(void)xsignal(SIGINFO, oldinti);
|
1993-03-21 12:45:37 +03:00
|
|
|
if (oldintp)
|
1997-03-13 09:23:11 +03:00
|
|
|
(void)signal(SIGPIPE, oldintp);
|
1993-03-21 12:45:37 +03:00
|
|
|
if (bytes > 0)
|
1996-12-06 05:06:46 +03:00
|
|
|
ptransfer(0);
|
1997-11-01 17:36:49 +03:00
|
|
|
goto cleanupsend;
|
1993-03-21 12:45:37 +03:00
|
|
|
abort:
|
1997-03-13 09:23:11 +03:00
|
|
|
(void)signal(SIGINT, oldintr);
|
1998-08-08 10:46:01 +04:00
|
|
|
(void)xsignal(SIGINFO, oldinti);
|
1993-03-21 12:45:37 +03:00
|
|
|
if (oldintp)
|
1997-03-13 09:23:11 +03:00
|
|
|
(void)signal(SIGPIPE, oldintp);
|
1993-03-21 12:45:37 +03:00
|
|
|
if (!cpend) {
|
|
|
|
code = -1;
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
if (data >= 0) {
|
1997-03-13 09:23:11 +03:00
|
|
|
(void)close(data);
|
1993-03-21 12:45:37 +03:00
|
|
|
data = -1;
|
|
|
|
}
|
|
|
|
if (dout)
|
1997-03-13 09:23:11 +03:00
|
|
|
(void)fclose(dout);
|
|
|
|
(void)getreply(0);
|
1993-03-21 12:45:37 +03:00
|
|
|
code = -1;
|
|
|
|
if (closefunc != NULL && fin != NULL)
|
|
|
|
(*closefunc)(fin);
|
|
|
|
if (bytes > 0)
|
1996-12-06 05:06:46 +03:00
|
|
|
ptransfer(0);
|
1997-11-01 17:36:49 +03:00
|
|
|
cleanupsend:
|
|
|
|
progress = oprogress;
|
|
|
|
restart_point = 0;
|
1993-03-21 12:45:37 +03:00
|
|
|
}
|
|
|
|
|
|
|
|
jmp_buf recvabort;
|
|
|
|
|
|
|
|
void
|
1997-03-13 09:23:11 +03:00
|
|
|
abortrecv(notused)
|
|
|
|
int notused;
|
1993-03-21 12:45:37 +03:00
|
|
|
{
|
|
|
|
|
[Yet Another Huge Ftp Commit - hopefully the last for a while,
barring any more little things people want added ...]
New features:
* progressmeter is now asynchronous, so "stalled" transfers can be
detected. "- stalled -" is displayed instead of the ETA in this case.
When the xfer resumes, the time that the xfer was stalled for is
factored out of the ETA. It is debatable whether this is better than
not factoring it out, but I like it this way (I.e, if it stalls for 8
seconds and the ETA was 30 seconds, when it resumes the ETA will still
be 30 seconds).
* verbosity can be disabled on the command line (-V), so that in auto-fetch
mode the only lines displayed will be a description of the file, and
the progress bar (if possible)
* if the screen is resized (and detected via the SIGWINCH signal), the
progress bar will rescale automatically.
Bugs fixed:
* progress bar will not use the last character on the line, as this can
cause problems on some terminals
* screen dimensions (via ioctl(TIOCWINSZ)) should use stdout not stdin
* progressmeter() used some vars before initialising them
* ^D will quit now. [fixes bin/3162]
* use hstrerror() to generate error message for host name lookup failure.
* use getcwd instead of getwd (it should have been OK, but why tempt fate?)
* auto-fetch transfers will always return a positive exit value upon failure
or interruption, relative to the file's position in argv[].
* remote completion of / will work, without putting a leading "///".
This is actually a bug in ftpd(1), where "NLST /" prefixes all names
with "//", but fixing every ftpd(1) is not an option...
1997-02-01 13:44:54 +03:00
|
|
|
alarmtimer(0);
|
1993-03-21 12:45:37 +03:00
|
|
|
mflag = 0;
|
|
|
|
abrtflag = 0;
|
1998-06-04 12:28:35 +04:00
|
|
|
fputs("\nreceive aborted\nwaiting for remote to finish abort.\n",
|
|
|
|
ttyout);
|
1993-03-21 12:45:37 +03:00
|
|
|
longjmp(recvabort, 1);
|
|
|
|
}
|
|
|
|
|
1994-08-25 07:47:50 +04:00
|
|
|
void
|
1997-08-18 14:20:13 +04:00
|
|
|
recvrequest(cmd, local, remote, lmode, printnames, ignorespecial)
|
1996-11-28 06:12:28 +03:00
|
|
|
const char *cmd, *local, *remote, *lmode;
|
1997-08-18 14:20:13 +04:00
|
|
|
int printnames, ignorespecial;
|
1993-03-21 12:45:37 +03:00
|
|
|
{
|
1997-07-20 13:45:35 +04:00
|
|
|
FILE *fout, *din;
|
1994-08-25 07:47:50 +04:00
|
|
|
int (*closefunc) __P((FILE *));
|
1996-11-25 08:13:18 +03:00
|
|
|
sig_t oldinti, oldintr, oldintp;
|
1997-07-20 13:45:35 +04:00
|
|
|
int c, d;
|
|
|
|
volatile int is_retr, tcrflag, bare_lfs;
|
1999-07-02 09:41:45 +04:00
|
|
|
static size_t bufsize;
|
|
|
|
static char *buf;
|
1997-07-20 13:45:35 +04:00
|
|
|
volatile off_t hashbytes;
|
1993-03-21 12:45:37 +03:00
|
|
|
struct stat st;
|
1996-11-28 06:12:28 +03:00
|
|
|
time_t mtime;
|
1996-12-06 05:06:46 +03:00
|
|
|
struct timeval tval[2];
|
1997-03-13 09:23:11 +03:00
|
|
|
int oprogress;
|
1997-03-16 17:24:14 +03:00
|
|
|
int opreserve;
|
1993-03-21 12:45:37 +03:00
|
|
|
|
1998-06-04 12:28:35 +04:00
|
|
|
#ifdef __GNUC__ /* to shut up gcc warnings */
|
1997-07-20 13:45:35 +04:00
|
|
|
(void)&local;
|
|
|
|
(void)&fout;
|
|
|
|
(void)&din;
|
|
|
|
(void)&closefunc;
|
|
|
|
(void)&oldinti;
|
|
|
|
(void)&oldintr;
|
|
|
|
(void)&oldintp;
|
|
|
|
#endif
|
|
|
|
|
|
|
|
fout = NULL;
|
|
|
|
din = NULL;
|
|
|
|
oldinti = NULL;
|
1996-12-06 05:06:46 +03:00
|
|
|
hashbytes = mark;
|
1996-11-25 08:13:18 +03:00
|
|
|
direction = "received";
|
|
|
|
bytes = 0;
|
1997-07-20 13:45:35 +04:00
|
|
|
bare_lfs = 0;
|
1996-12-06 05:06:46 +03:00
|
|
|
filesize = -1;
|
1997-03-13 09:23:11 +03:00
|
|
|
oprogress = progress;
|
1997-03-16 17:24:14 +03:00
|
|
|
opreserve = preserve;
|
1997-11-01 17:36:49 +03:00
|
|
|
is_retr = (strcmp(cmd, "RETR") == 0);
|
1993-03-21 12:45:37 +03:00
|
|
|
if (is_retr && verbose && printnames) {
|
1997-08-18 14:20:13 +04:00
|
|
|
if (local && (ignorespecial || *local != '-'))
|
1998-06-04 12:28:35 +04:00
|
|
|
fprintf(ttyout, "local: %s ", local);
|
1993-03-21 12:45:37 +03:00
|
|
|
if (remote)
|
1998-06-04 12:28:35 +04:00
|
|
|
fprintf(ttyout, "remote: %s\n", remote);
|
1993-03-21 12:45:37 +03:00
|
|
|
}
|
|
|
|
if (proxy && is_retr) {
|
|
|
|
proxtrans(cmd, local, remote);
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
closefunc = NULL;
|
|
|
|
oldintr = NULL;
|
|
|
|
oldintp = NULL;
|
|
|
|
tcrflag = !crflag && is_retr;
|
|
|
|
if (setjmp(recvabort)) {
|
|
|
|
while (cpend) {
|
1997-03-13 09:23:11 +03:00
|
|
|
(void)getreply(0);
|
1993-03-21 12:45:37 +03:00
|
|
|
}
|
|
|
|
if (data >= 0) {
|
1997-03-13 09:23:11 +03:00
|
|
|
(void)close(data);
|
1993-03-21 12:45:37 +03:00
|
|
|
data = -1;
|
|
|
|
}
|
|
|
|
if (oldintr)
|
1997-03-13 09:23:11 +03:00
|
|
|
(void)signal(SIGINT, oldintr);
|
1996-11-25 08:13:18 +03:00
|
|
|
if (oldinti)
|
1998-08-08 10:46:01 +04:00
|
|
|
(void)xsignal(SIGINFO, oldinti);
|
1997-03-13 09:23:11 +03:00
|
|
|
progress = oprogress;
|
1997-03-16 17:24:14 +03:00
|
|
|
preserve = opreserve;
|
1993-03-21 12:45:37 +03:00
|
|
|
code = -1;
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
oldintr = signal(SIGINT, abortrecv);
|
1998-08-08 10:46:01 +04:00
|
|
|
oldinti = xsignal(SIGINFO, psummary);
|
1997-08-18 14:20:13 +04:00
|
|
|
if (ignorespecial || (strcmp(local, "-") && *local != '|')) {
|
1997-09-13 13:05:52 +04:00
|
|
|
if (access(local, W_OK) < 0) {
|
1994-08-25 07:47:50 +04:00
|
|
|
char *dir = strrchr(local, '/');
|
1993-03-21 12:45:37 +03:00
|
|
|
|
|
|
|
if (errno != ENOENT && errno != EACCES) {
|
1994-08-25 07:47:50 +04:00
|
|
|
warn("local: %s", local);
|
1997-03-13 09:23:11 +03:00
|
|
|
(void)signal(SIGINT, oldintr);
|
1998-08-08 10:46:01 +04:00
|
|
|
(void)xsignal(SIGINFO, oldinti);
|
1993-03-21 12:45:37 +03:00
|
|
|
code = -1;
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
if (dir != NULL)
|
|
|
|
*dir = 0;
|
[fear this; more ftp hacking from lukem :-]
features:
---------
* transfer rate throttling with the new `rate' command. syntax:
rate direction [max [incr]]
where direction is `all', `get' or `put'.
if max is not supplied, the current settings are displayed.
if max is supplied, then transfers in the given direction will
be throttled to this value.
if incr is supplied, the increment for the `on-the-fly' scaling
will be set to that, otherwise `1024' is used.
currently implemented for binary get, binary put, and url fetches.
not yet supported for ascii get or put, or local file copies.
* on-the-fly scaling of the throttle based on signals:
- SIGUSR1 raises the throttle rate by the increment for that direction
- SIGUSR2 lowers the throttle rate by the increment for that direction
* -T dir,max[,incr] option to set rate from the command line
* `k', `m', `g' suffix support for bytecounts in the `hash', `rate',
`rcvbuf' and `sndbuf' commands)
bug fixes and code mods:
------------------------
* fix up ftp_login() so that ruserpass() is always called, even for
command-line url fetches.
* implement strsuftoi(), which parses a given number into a int with
suffix support. replaces getsockbufsize()
* implement parserate(), which does the argv parsing for -T and rate
* save and restore errno in signal handlers (may not be necessary, but
it doesn't hurt)
notes:
------
the rate command has had reasonable testing, but I'd like feedback
if it doesn't do the right thing, especially from people on slower
(i.e, modem) links.
I haven't tested the rate throttle against a http server which does
`transfer-encoding: chunked' because I couldn't find a server to
test against.
1999-06-29 14:43:16 +04:00
|
|
|
d = access(dir == local ? "/" :
|
|
|
|
dir ? local : ".", W_OK);
|
1993-03-21 12:45:37 +03:00
|
|
|
if (dir != NULL)
|
|
|
|
*dir = '/';
|
|
|
|
if (d < 0) {
|
1994-08-25 07:47:50 +04:00
|
|
|
warn("local: %s", local);
|
1997-03-13 09:23:11 +03:00
|
|
|
(void)signal(SIGINT, oldintr);
|
1998-08-08 10:46:01 +04:00
|
|
|
(void)xsignal(SIGINFO, oldinti);
|
1993-03-21 12:45:37 +03:00
|
|
|
code = -1;
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
if (!runique && errno == EACCES &&
|
1998-06-04 12:28:35 +04:00
|
|
|
chmod(local, (S_IRUSR|S_IWUSR)) < 0) {
|
1994-08-25 07:47:50 +04:00
|
|
|
warn("local: %s", local);
|
1997-03-13 09:23:11 +03:00
|
|
|
(void)signal(SIGINT, oldintr);
|
1998-08-08 10:46:01 +04:00
|
|
|
(void)xsignal(SIGINFO, oldinti);
|
1993-03-21 12:45:37 +03:00
|
|
|
code = -1;
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
if (runique && errno == EACCES &&
|
|
|
|
(local = gunique(local)) == NULL) {
|
1997-03-13 09:23:11 +03:00
|
|
|
(void)signal(SIGINT, oldintr);
|
1998-08-08 10:46:01 +04:00
|
|
|
(void)xsignal(SIGINFO, oldinti);
|
1993-03-21 12:45:37 +03:00
|
|
|
code = -1;
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else if (runique && (local = gunique(local)) == NULL) {
|
1997-03-13 09:23:11 +03:00
|
|
|
(void)signal(SIGINT, oldintr);
|
1998-08-08 10:46:01 +04:00
|
|
|
(void)xsignal(SIGINFO, oldinti);
|
1993-03-21 12:45:37 +03:00
|
|
|
code = -1;
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if (!is_retr) {
|
|
|
|
if (curtype != TYPE_A)
|
|
|
|
changetype(TYPE_A, 0);
|
1996-12-06 05:06:46 +03:00
|
|
|
} else {
|
|
|
|
if (curtype != type)
|
|
|
|
changetype(type, 0);
|
1996-12-29 07:05:29 +03:00
|
|
|
filesize = remotesize(remote, 0);
|
1996-12-06 05:06:46 +03:00
|
|
|
}
|
1993-03-21 12:45:37 +03:00
|
|
|
if (initconn()) {
|
1997-03-13 09:23:11 +03:00
|
|
|
(void)signal(SIGINT, oldintr);
|
1998-08-08 10:46:01 +04:00
|
|
|
(void)xsignal(SIGINFO, oldinti);
|
1993-03-21 12:45:37 +03:00
|
|
|
code = -1;
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
if (setjmp(recvabort))
|
|
|
|
goto abort;
|
|
|
|
if (is_retr && restart_point &&
|
1998-05-20 04:54:52 +04:00
|
|
|
#ifndef NO_QUAD
|
1997-11-01 17:36:49 +03:00
|
|
|
command("REST %qd", (long long) restart_point) != CONTINUE)
|
1998-05-20 04:54:52 +04:00
|
|
|
#else
|
|
|
|
command("REST %ld", (long) restart_point) != CONTINUE)
|
|
|
|
#endif
|
1993-03-21 12:45:37 +03:00
|
|
|
return;
|
|
|
|
if (remote) {
|
|
|
|
if (command("%s %s", cmd, remote) != PRELIM) {
|
1997-03-13 09:23:11 +03:00
|
|
|
(void)signal(SIGINT, oldintr);
|
1998-08-08 10:46:01 +04:00
|
|
|
(void)xsignal(SIGINFO, oldinti);
|
1993-03-21 12:45:37 +03:00
|
|
|
return;
|
|
|
|
}
|
|
|
|
} else {
|
|
|
|
if (command("%s", cmd) != PRELIM) {
|
1997-03-13 09:23:11 +03:00
|
|
|
(void)signal(SIGINT, oldintr);
|
1998-08-08 10:46:01 +04:00
|
|
|
(void)xsignal(SIGINFO, oldinti);
|
1993-03-21 12:45:37 +03:00
|
|
|
return;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
din = dataconn("r");
|
|
|
|
if (din == NULL)
|
|
|
|
goto abort;
|
1997-08-18 14:20:13 +04:00
|
|
|
if (!ignorespecial && strcmp(local, "-") == 0) {
|
1993-03-21 12:45:37 +03:00
|
|
|
fout = stdout;
|
1997-03-13 09:23:11 +03:00
|
|
|
progress = 0;
|
1997-03-16 17:24:14 +03:00
|
|
|
preserve = 0;
|
1997-08-18 14:20:13 +04:00
|
|
|
} else if (!ignorespecial && *local == '|') {
|
1993-03-21 12:45:37 +03:00
|
|
|
oldintp = signal(SIGPIPE, SIG_IGN);
|
|
|
|
fout = popen(local + 1, "w");
|
|
|
|
if (fout == NULL) {
|
1994-08-25 07:47:50 +04:00
|
|
|
warn("%s", local+1);
|
1993-03-21 12:45:37 +03:00
|
|
|
goto abort;
|
|
|
|
}
|
1997-03-13 09:23:11 +03:00
|
|
|
progress = 0;
|
1997-03-16 17:24:14 +03:00
|
|
|
preserve = 0;
|
1993-03-21 12:45:37 +03:00
|
|
|
closefunc = pclose;
|
|
|
|
} else {
|
|
|
|
fout = fopen(local, lmode);
|
|
|
|
if (fout == NULL) {
|
1994-08-25 07:47:50 +04:00
|
|
|
warn("local: %s", local);
|
1993-03-21 12:45:37 +03:00
|
|
|
goto abort;
|
|
|
|
}
|
|
|
|
closefunc = fclose;
|
|
|
|
}
|
[fear this; more ftp hacking from lukem :-]
features:
---------
* transfer rate throttling with the new `rate' command. syntax:
rate direction [max [incr]]
where direction is `all', `get' or `put'.
if max is not supplied, the current settings are displayed.
if max is supplied, then transfers in the given direction will
be throttled to this value.
if incr is supplied, the increment for the `on-the-fly' scaling
will be set to that, otherwise `1024' is used.
currently implemented for binary get, binary put, and url fetches.
not yet supported for ascii get or put, or local file copies.
* on-the-fly scaling of the throttle based on signals:
- SIGUSR1 raises the throttle rate by the increment for that direction
- SIGUSR2 lowers the throttle rate by the increment for that direction
* -T dir,max[,incr] option to set rate from the command line
* `k', `m', `g' suffix support for bytecounts in the `hash', `rate',
`rcvbuf' and `sndbuf' commands)
bug fixes and code mods:
------------------------
* fix up ftp_login() so that ruserpass() is always called, even for
command-line url fetches.
* implement strsuftoi(), which parses a given number into a int with
suffix support. replaces getsockbufsize()
* implement parserate(), which does the argv parsing for -T and rate
* save and restore errno in signal handlers (may not be necessary, but
it doesn't hurt)
notes:
------
the rate command has had reasonable testing, but I'd like feedback
if it doesn't do the right thing, especially from people on slower
(i.e, modem) links.
I haven't tested the rate throttle against a http server which does
`transfer-encoding: chunked' because I couldn't find a server to
test against.
1999-06-29 14:43:16 +04:00
|
|
|
|
|
|
|
/*
|
|
|
|
* XXX: look at punting and just using sndbuf_* for
|
|
|
|
* the buffer size, since st.st_blksize ~= 512
|
|
|
|
* and BUFSIZ ~= 4K
|
|
|
|
*/
|
1993-03-21 12:45:37 +03:00
|
|
|
if (fstat(fileno(fout), &st) < 0 || st.st_blksize == 0)
|
|
|
|
st.st_blksize = BUFSIZ;
|
|
|
|
if (st.st_blksize > bufsize) {
|
|
|
|
if (buf)
|
1997-03-13 09:23:11 +03:00
|
|
|
(void)free(buf);
|
1993-03-21 12:45:37 +03:00
|
|
|
bufsize = st.st_blksize;
|
1998-08-03 05:49:25 +04:00
|
|
|
buf = xmalloc(bufsize);
|
1993-03-21 12:45:37 +03:00
|
|
|
}
|
1997-10-19 23:09:05 +04:00
|
|
|
if (!S_ISREG(st.st_mode)) {
|
1997-03-16 17:24:14 +03:00
|
|
|
progress = 0;
|
|
|
|
preserve = 0;
|
|
|
|
}
|
1996-12-06 05:06:46 +03:00
|
|
|
progressmeter(-1);
|
1993-03-21 12:45:37 +03:00
|
|
|
switch (curtype) {
|
|
|
|
|
|
|
|
case TYPE_I:
|
|
|
|
case TYPE_L:
|
1997-11-01 17:36:49 +03:00
|
|
|
if (is_retr && restart_point &&
|
1994-08-25 07:47:50 +04:00
|
|
|
lseek(fileno(fout), restart_point, SEEK_SET) < 0) {
|
|
|
|
warn("local: %s", local);
|
1997-03-13 09:23:11 +03:00
|
|
|
progress = oprogress;
|
1997-03-16 17:24:14 +03:00
|
|
|
preserve = opreserve;
|
1993-03-21 12:45:37 +03:00
|
|
|
if (closefunc != NULL)
|
|
|
|
(*closefunc)(fout);
|
|
|
|
return;
|
|
|
|
}
|
[fear this; more ftp hacking from lukem :-]
features:
---------
* transfer rate throttling with the new `rate' command. syntax:
rate direction [max [incr]]
where direction is `all', `get' or `put'.
if max is not supplied, the current settings are displayed.
if max is supplied, then transfers in the given direction will
be throttled to this value.
if incr is supplied, the increment for the `on-the-fly' scaling
will be set to that, otherwise `1024' is used.
currently implemented for binary get, binary put, and url fetches.
not yet supported for ascii get or put, or local file copies.
* on-the-fly scaling of the throttle based on signals:
- SIGUSR1 raises the throttle rate by the increment for that direction
- SIGUSR2 lowers the throttle rate by the increment for that direction
* -T dir,max[,incr] option to set rate from the command line
* `k', `m', `g' suffix support for bytecounts in the `hash', `rate',
`rcvbuf' and `sndbuf' commands)
bug fixes and code mods:
------------------------
* fix up ftp_login() so that ruserpass() is always called, even for
command-line url fetches.
* implement strsuftoi(), which parses a given number into a int with
suffix support. replaces getsockbufsize()
* implement parserate(), which does the argv parsing for -T and rate
* save and restore errno in signal handlers (may not be necessary, but
it doesn't hurt)
notes:
------
the rate command has had reasonable testing, but I'd like feedback
if it doesn't do the right thing, especially from people on slower
(i.e, modem) links.
I haven't tested the rate throttle against a http server which does
`transfer-encoding: chunked' because I couldn't find a server to
test against.
1999-06-29 14:43:16 +04:00
|
|
|
while (1) {
|
|
|
|
struct timeval then, now, td;
|
|
|
|
off_t bufrem;
|
|
|
|
|
|
|
|
(void)gettimeofday(&then, NULL);
|
|
|
|
errno = c = d = 0;
|
|
|
|
bufrem = rate_get ? rate_get : bufsize;
|
|
|
|
while (bufrem > 0) {
|
|
|
|
if ((c = read(fileno(din), buf,
|
|
|
|
MIN(bufsize, bufrem))) <= 0)
|
|
|
|
goto recvdone;
|
|
|
|
bytes += c;
|
|
|
|
bufrem -=c;
|
|
|
|
if ((d = write(fileno(fout), buf, c)) != c)
|
|
|
|
goto recvdone;
|
|
|
|
if (hash && (!progress || filesize < 0)) {
|
|
|
|
while (bytes >= hashbytes) {
|
|
|
|
(void)putc('#', ttyout);
|
|
|
|
hashbytes += mark;
|
|
|
|
}
|
|
|
|
(void)fflush(ttyout);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if (rate_get) {
|
|
|
|
while (1) {
|
|
|
|
(void)gettimeofday(&now, NULL);
|
|
|
|
timersub(&now, &then, &td);
|
|
|
|
if (td.tv_sec > 0)
|
|
|
|
break;
|
|
|
|
usleep(1000000 - td.tv_usec);
|
1993-03-21 12:45:37 +03:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
[fear this; more ftp hacking from lukem :-]
features:
---------
* transfer rate throttling with the new `rate' command. syntax:
rate direction [max [incr]]
where direction is `all', `get' or `put'.
if max is not supplied, the current settings are displayed.
if max is supplied, then transfers in the given direction will
be throttled to this value.
if incr is supplied, the increment for the `on-the-fly' scaling
will be set to that, otherwise `1024' is used.
currently implemented for binary get, binary put, and url fetches.
not yet supported for ascii get or put, or local file copies.
* on-the-fly scaling of the throttle based on signals:
- SIGUSR1 raises the throttle rate by the increment for that direction
- SIGUSR2 lowers the throttle rate by the increment for that direction
* -T dir,max[,incr] option to set rate from the command line
* `k', `m', `g' suffix support for bytecounts in the `hash', `rate',
`rcvbuf' and `sndbuf' commands)
bug fixes and code mods:
------------------------
* fix up ftp_login() so that ruserpass() is always called, even for
command-line url fetches.
* implement strsuftoi(), which parses a given number into a int with
suffix support. replaces getsockbufsize()
* implement parserate(), which does the argv parsing for -T and rate
* save and restore errno in signal handlers (may not be necessary, but
it doesn't hurt)
notes:
------
the rate command has had reasonable testing, but I'd like feedback
if it doesn't do the right thing, especially from people on slower
(i.e, modem) links.
I haven't tested the rate throttle against a http server which does
`transfer-encoding: chunked' because I couldn't find a server to
test against.
1999-06-29 14:43:16 +04:00
|
|
|
recvdone:
|
[Yet Another Huge Ftp Commit - hopefully the last for a while,
barring any more little things people want added ...]
New features:
* progressmeter is now asynchronous, so "stalled" transfers can be
detected. "- stalled -" is displayed instead of the ETA in this case.
When the xfer resumes, the time that the xfer was stalled for is
factored out of the ETA. It is debatable whether this is better than
not factoring it out, but I like it this way (I.e, if it stalls for 8
seconds and the ETA was 30 seconds, when it resumes the ETA will still
be 30 seconds).
* verbosity can be disabled on the command line (-V), so that in auto-fetch
mode the only lines displayed will be a description of the file, and
the progress bar (if possible)
* if the screen is resized (and detected via the SIGWINCH signal), the
progress bar will rescale automatically.
Bugs fixed:
* progress bar will not use the last character on the line, as this can
cause problems on some terminals
* screen dimensions (via ioctl(TIOCWINSZ)) should use stdout not stdin
* progressmeter() used some vars before initialising them
* ^D will quit now. [fixes bin/3162]
* use hstrerror() to generate error message for host name lookup failure.
* use getcwd instead of getwd (it should have been OK, but why tempt fate?)
* auto-fetch transfers will always return a positive exit value upon failure
or interruption, relative to the file's position in argv[].
* remote completion of / will work, without putting a leading "///".
This is actually a bug in ftpd(1), where "NLST /" prefixes all names
with "//", but fixing every ftpd(1) is not an option...
1997-02-01 13:44:54 +03:00
|
|
|
if (hash && (!progress || filesize < 0) && bytes > 0) {
|
1996-11-25 08:13:18 +03:00
|
|
|
if (bytes < mark)
|
1998-06-04 12:28:35 +04:00
|
|
|
(void)putc('#', ttyout);
|
|
|
|
(void)putc('\n', ttyout);
|
1993-03-21 12:45:37 +03:00
|
|
|
}
|
|
|
|
if (c < 0) {
|
|
|
|
if (errno != EPIPE)
|
1994-08-25 07:47:50 +04:00
|
|
|
warn("netin");
|
1993-03-21 12:45:37 +03:00
|
|
|
bytes = -1;
|
|
|
|
}
|
|
|
|
if (d < c) {
|
|
|
|
if (d < 0)
|
1994-08-25 07:47:50 +04:00
|
|
|
warn("local: %s", local);
|
1993-03-21 12:45:37 +03:00
|
|
|
else
|
1994-08-25 07:47:50 +04:00
|
|
|
warnx("%s: short write", local);
|
1993-03-21 12:45:37 +03:00
|
|
|
}
|
|
|
|
break;
|
|
|
|
|
|
|
|
case TYPE_A:
|
1997-11-01 17:36:49 +03:00
|
|
|
if (is_retr && restart_point) {
|
|
|
|
int ch;
|
|
|
|
long i, n;
|
1993-03-21 12:45:37 +03:00
|
|
|
|
1994-08-25 07:47:50 +04:00
|
|
|
if (fseek(fout, 0L, SEEK_SET) < 0)
|
1993-03-21 12:45:37 +03:00
|
|
|
goto done;
|
1997-11-01 17:36:49 +03:00
|
|
|
n = (long)restart_point;
|
1993-03-21 12:45:37 +03:00
|
|
|
for (i = 0; i++ < n;) {
|
|
|
|
if ((ch = getc(fout)) == EOF)
|
|
|
|
goto done;
|
|
|
|
if (ch == '\n')
|
|
|
|
i++;
|
|
|
|
}
|
1994-08-25 07:47:50 +04:00
|
|
|
if (fseek(fout, 0L, SEEK_CUR) < 0) {
|
1993-03-21 12:45:37 +03:00
|
|
|
done:
|
1994-08-25 07:47:50 +04:00
|
|
|
warn("local: %s", local);
|
1997-03-13 09:23:11 +03:00
|
|
|
progress = oprogress;
|
1997-03-16 17:24:14 +03:00
|
|
|
preserve = opreserve;
|
1993-03-21 12:45:37 +03:00
|
|
|
if (closefunc != NULL)
|
|
|
|
(*closefunc)(fout);
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
while ((c = getc(din)) != EOF) {
|
|
|
|
if (c == '\n')
|
|
|
|
bare_lfs++;
|
|
|
|
while (c == '\r') {
|
[Yet Another Huge Ftp Commit - hopefully the last for a while,
barring any more little things people want added ...]
New features:
* progressmeter is now asynchronous, so "stalled" transfers can be
detected. "- stalled -" is displayed instead of the ETA in this case.
When the xfer resumes, the time that the xfer was stalled for is
factored out of the ETA. It is debatable whether this is better than
not factoring it out, but I like it this way (I.e, if it stalls for 8
seconds and the ETA was 30 seconds, when it resumes the ETA will still
be 30 seconds).
* verbosity can be disabled on the command line (-V), so that in auto-fetch
mode the only lines displayed will be a description of the file, and
the progress bar (if possible)
* if the screen is resized (and detected via the SIGWINCH signal), the
progress bar will rescale automatically.
Bugs fixed:
* progress bar will not use the last character on the line, as this can
cause problems on some terminals
* screen dimensions (via ioctl(TIOCWINSZ)) should use stdout not stdin
* progressmeter() used some vars before initialising them
* ^D will quit now. [fixes bin/3162]
* use hstrerror() to generate error message for host name lookup failure.
* use getcwd instead of getwd (it should have been OK, but why tempt fate?)
* auto-fetch transfers will always return a positive exit value upon failure
or interruption, relative to the file's position in argv[].
* remote completion of / will work, without putting a leading "///".
This is actually a bug in ftpd(1), where "NLST /" prefixes all names
with "//", but fixing every ftpd(1) is not an option...
1997-02-01 13:44:54 +03:00
|
|
|
while (hash && (!progress || filesize < 0) &&
|
1996-12-06 05:06:46 +03:00
|
|
|
(bytes >= hashbytes)) {
|
1998-06-04 12:28:35 +04:00
|
|
|
(void)putc('#', ttyout);
|
|
|
|
(void)fflush(ttyout);
|
1996-11-25 08:13:18 +03:00
|
|
|
hashbytes += mark;
|
1993-03-21 12:45:37 +03:00
|
|
|
}
|
|
|
|
bytes++;
|
|
|
|
if ((c = getc(din)) != '\n' || tcrflag) {
|
|
|
|
if (ferror(fout))
|
|
|
|
goto break2;
|
1997-03-13 09:23:11 +03:00
|
|
|
(void)putc('\r', fout);
|
1993-03-21 12:45:37 +03:00
|
|
|
if (c == '\0') {
|
|
|
|
bytes++;
|
|
|
|
goto contin2;
|
|
|
|
}
|
|
|
|
if (c == EOF)
|
|
|
|
goto contin2;
|
|
|
|
}
|
|
|
|
}
|
1997-03-13 09:23:11 +03:00
|
|
|
(void)putc(c, fout);
|
1993-03-21 12:45:37 +03:00
|
|
|
bytes++;
|
|
|
|
contin2: ;
|
|
|
|
}
|
|
|
|
break2:
|
[Yet Another Huge Ftp Commit - hopefully the last for a while,
barring any more little things people want added ...]
New features:
* progressmeter is now asynchronous, so "stalled" transfers can be
detected. "- stalled -" is displayed instead of the ETA in this case.
When the xfer resumes, the time that the xfer was stalled for is
factored out of the ETA. It is debatable whether this is better than
not factoring it out, but I like it this way (I.e, if it stalls for 8
seconds and the ETA was 30 seconds, when it resumes the ETA will still
be 30 seconds).
* verbosity can be disabled on the command line (-V), so that in auto-fetch
mode the only lines displayed will be a description of the file, and
the progress bar (if possible)
* if the screen is resized (and detected via the SIGWINCH signal), the
progress bar will rescale automatically.
Bugs fixed:
* progress bar will not use the last character on the line, as this can
cause problems on some terminals
* screen dimensions (via ioctl(TIOCWINSZ)) should use stdout not stdin
* progressmeter() used some vars before initialising them
* ^D will quit now. [fixes bin/3162]
* use hstrerror() to generate error message for host name lookup failure.
* use getcwd instead of getwd (it should have been OK, but why tempt fate?)
* auto-fetch transfers will always return a positive exit value upon failure
or interruption, relative to the file's position in argv[].
* remote completion of / will work, without putting a leading "///".
This is actually a bug in ftpd(1), where "NLST /" prefixes all names
with "//", but fixing every ftpd(1) is not an option...
1997-02-01 13:44:54 +03:00
|
|
|
if (hash && (!progress || filesize < 0)) {
|
1993-03-21 12:45:37 +03:00
|
|
|
if (bytes < hashbytes)
|
1998-06-04 12:28:35 +04:00
|
|
|
(void)putc('#', ttyout);
|
|
|
|
(void)putc('\n', ttyout);
|
1993-03-21 12:45:37 +03:00
|
|
|
}
|
|
|
|
if (ferror(din)) {
|
|
|
|
if (errno != EPIPE)
|
1994-08-25 07:47:50 +04:00
|
|
|
warn("netin");
|
1993-03-21 12:45:37 +03:00
|
|
|
bytes = -1;
|
|
|
|
}
|
|
|
|
if (ferror(fout))
|
1994-08-25 07:47:50 +04:00
|
|
|
warn("local: %s", local);
|
1993-03-21 12:45:37 +03:00
|
|
|
break;
|
|
|
|
}
|
[Yet Another Huge Ftp Commit - hopefully the last for a while,
barring any more little things people want added ...]
New features:
* progressmeter is now asynchronous, so "stalled" transfers can be
detected. "- stalled -" is displayed instead of the ETA in this case.
When the xfer resumes, the time that the xfer was stalled for is
factored out of the ETA. It is debatable whether this is better than
not factoring it out, but I like it this way (I.e, if it stalls for 8
seconds and the ETA was 30 seconds, when it resumes the ETA will still
be 30 seconds).
* verbosity can be disabled on the command line (-V), so that in auto-fetch
mode the only lines displayed will be a description of the file, and
the progress bar (if possible)
* if the screen is resized (and detected via the SIGWINCH signal), the
progress bar will rescale automatically.
Bugs fixed:
* progress bar will not use the last character on the line, as this can
cause problems on some terminals
* screen dimensions (via ioctl(TIOCWINSZ)) should use stdout not stdin
* progressmeter() used some vars before initialising them
* ^D will quit now. [fixes bin/3162]
* use hstrerror() to generate error message for host name lookup failure.
* use getcwd instead of getwd (it should have been OK, but why tempt fate?)
* auto-fetch transfers will always return a positive exit value upon failure
or interruption, relative to the file's position in argv[].
* remote completion of / will work, without putting a leading "///".
This is actually a bug in ftpd(1), where "NLST /" prefixes all names
with "//", but fixing every ftpd(1) is not an option...
1997-02-01 13:44:54 +03:00
|
|
|
progressmeter(1);
|
1993-03-21 12:45:37 +03:00
|
|
|
if (closefunc != NULL)
|
|
|
|
(*closefunc)(fout);
|
1997-03-13 09:23:11 +03:00
|
|
|
(void)signal(SIGINT, oldintr);
|
1998-08-08 10:46:01 +04:00
|
|
|
(void)xsignal(SIGINFO, oldinti);
|
1993-03-21 12:45:37 +03:00
|
|
|
if (oldintp)
|
1997-03-13 09:23:11 +03:00
|
|
|
(void)signal(SIGPIPE, oldintp);
|
|
|
|
(void)fclose(din);
|
|
|
|
(void)getreply(0);
|
1999-05-04 18:12:37 +04:00
|
|
|
if (bare_lfs) {
|
|
|
|
fprintf(ttyout,
|
|
|
|
"WARNING! %d bare linefeeds received in ASCII mode.\n",
|
|
|
|
bare_lfs);
|
|
|
|
fputs("File may not have transferred correctly.\n", ttyout);
|
|
|
|
}
|
1996-12-29 07:05:29 +03:00
|
|
|
if (bytes >= 0 && is_retr) {
|
|
|
|
if (bytes > 0)
|
|
|
|
ptransfer(0);
|
1996-11-28 06:12:28 +03:00
|
|
|
if (preserve && (closefunc == fclose)) {
|
1996-12-29 07:05:29 +03:00
|
|
|
mtime = remotemodtime(remote, 0);
|
1996-11-28 06:12:28 +03:00
|
|
|
if (mtime != -1) {
|
1998-01-18 17:23:33 +03:00
|
|
|
(void)gettimeofday(&tval[0], NULL);
|
1996-12-06 05:06:46 +03:00
|
|
|
tval[1].tv_sec = mtime;
|
|
|
|
tval[1].tv_usec = 0;
|
|
|
|
if (utimes(local, tval) == -1) {
|
1998-06-04 12:28:35 +04:00
|
|
|
fprintf(ttyout,
|
1997-03-13 09:23:11 +03:00
|
|
|
"Can't change modification time on %s to %s",
|
|
|
|
local, asctime(localtime(&mtime)));
|
1996-11-28 06:12:28 +03:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
1998-05-20 13:43:41 +04:00
|
|
|
progress = oprogress;
|
|
|
|
preserve = opreserve;
|
1993-03-21 12:45:37 +03:00
|
|
|
return;
|
1997-03-13 09:23:11 +03:00
|
|
|
|
1993-03-21 12:45:37 +03:00
|
|
|
abort:
|
|
|
|
|
1999-04-28 17:35:40 +04:00
|
|
|
/* abort using RFC 959 recommended IP,SYNC sequence */
|
1993-03-21 12:45:37 +03:00
|
|
|
|
1997-03-13 09:23:11 +03:00
|
|
|
progress = oprogress;
|
1997-03-16 17:24:14 +03:00
|
|
|
preserve = opreserve;
|
1993-03-21 12:45:37 +03:00
|
|
|
if (oldintp)
|
1997-03-13 09:23:11 +03:00
|
|
|
(void)signal(SIGPIPE, oldintp);
|
|
|
|
(void)signal(SIGINT, SIG_IGN);
|
1993-03-21 12:45:37 +03:00
|
|
|
if (!cpend) {
|
|
|
|
code = -1;
|
1997-03-13 09:23:11 +03:00
|
|
|
(void)signal(SIGINT, oldintr);
|
1998-08-08 10:46:01 +04:00
|
|
|
(void)xsignal(SIGINFO, oldinti);
|
1993-03-21 12:45:37 +03:00
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
abort_remote(din);
|
|
|
|
code = -1;
|
|
|
|
if (data >= 0) {
|
1997-03-13 09:23:11 +03:00
|
|
|
(void)close(data);
|
1993-03-21 12:45:37 +03:00
|
|
|
data = -1;
|
|
|
|
}
|
|
|
|
if (closefunc != NULL && fout != NULL)
|
|
|
|
(*closefunc)(fout);
|
|
|
|
if (din)
|
1997-03-13 09:23:11 +03:00
|
|
|
(void)fclose(din);
|
1993-03-21 12:45:37 +03:00
|
|
|
if (bytes > 0)
|
1996-12-06 05:06:46 +03:00
|
|
|
ptransfer(0);
|
1997-03-13 09:23:11 +03:00
|
|
|
(void)signal(SIGINT, oldintr);
|
1998-08-08 10:46:01 +04:00
|
|
|
(void)xsignal(SIGINFO, oldinti);
|
1993-03-21 12:45:37 +03:00
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Need to start a listen on the data channel before we send the command,
|
|
|
|
* otherwise the server's connect may fail.
|
|
|
|
*/
|
1994-08-25 07:47:50 +04:00
|
|
|
int
|
1993-03-21 12:45:37 +03:00
|
|
|
initconn()
|
|
|
|
{
|
1994-08-25 07:47:50 +04:00
|
|
|
char *p, *a;
|
1993-03-21 12:45:37 +03:00
|
|
|
int result, len, tmpno = 0;
|
|
|
|
int on = 1;
|
1999-07-02 12:07:40 +04:00
|
|
|
int error;
|
|
|
|
u_int addr[16], port[2];
|
|
|
|
u_int af, hal, pal;
|
|
|
|
char *pasvcmd = NULL;
|
1994-08-25 08:27:41 +04:00
|
|
|
|
1999-09-01 09:03:41 +04:00
|
|
|
if (myctladdr.su_family == AF_INET6
|
|
|
|
&& (IN6_IS_ADDR_LINKLOCAL(&myctladdr.su_sin6.sin6_addr)
|
|
|
|
|| IN6_IS_ADDR_SITELOCAL(&myctladdr.su_sin6.sin6_addr))) {
|
|
|
|
warnx("use of scoped address can be troublesome");
|
|
|
|
}
|
1998-06-04 12:28:35 +04:00
|
|
|
reinit:
|
1994-08-25 08:27:41 +04:00
|
|
|
if (passivemode) {
|
1999-07-02 12:07:40 +04:00
|
|
|
data_addr = myctladdr;
|
|
|
|
data = socket(data_addr.su_family, SOCK_STREAM, 0);
|
1994-08-25 08:27:41 +04:00
|
|
|
if (data < 0) {
|
1996-12-29 07:05:29 +03:00
|
|
|
warn("socket");
|
1997-01-19 17:19:02 +03:00
|
|
|
return (1);
|
1994-08-25 08:27:41 +04:00
|
|
|
}
|
|
|
|
if ((options & SO_DEBUG) &&
|
|
|
|
setsockopt(data, SOL_SOCKET, SO_DEBUG, (char *)&on,
|
1997-03-13 09:23:11 +03:00
|
|
|
sizeof(on)) < 0)
|
1996-12-29 07:05:29 +03:00
|
|
|
warn("setsockopt (ignored)");
|
1999-07-12 00:37:39 +04:00
|
|
|
result = COMPLETE + 1;
|
1999-07-02 12:07:40 +04:00
|
|
|
switch (data_addr.su_family) {
|
|
|
|
case AF_INET:
|
1999-07-14 01:43:31 +04:00
|
|
|
if (epsv4) {
|
1999-07-12 00:37:39 +04:00
|
|
|
result = command(pasvcmd = "EPSV");
|
1999-07-14 01:43:31 +04:00
|
|
|
/*
|
|
|
|
* this code is to be friendly with broken
|
|
|
|
* BSDI ftpd
|
|
|
|
*/
|
1999-07-18 02:39:18 +04:00
|
|
|
if (code / 10 == 22 && code != 229) {
|
1999-07-14 01:43:31 +04:00
|
|
|
fputs(
|
|
|
|
"wrong server: return code must be 229\n",
|
|
|
|
ttyout);
|
|
|
|
result = COMPLETE + 1;
|
|
|
|
}
|
|
|
|
}
|
1999-07-02 12:07:40 +04:00
|
|
|
if (result != COMPLETE)
|
|
|
|
result = command(pasvcmd = "PASV");
|
|
|
|
break;
|
|
|
|
case AF_INET6:
|
|
|
|
result = command(pasvcmd = "EPSV");
|
1999-07-14 01:43:31 +04:00
|
|
|
/* this code is to be friendly with broken BSDI ftpd */
|
1999-07-18 02:39:18 +04:00
|
|
|
if (code / 10 == 22 && code != 229) {
|
1999-07-14 01:43:31 +04:00
|
|
|
fputs(
|
|
|
|
"wrong server: return code must be 229\n",
|
|
|
|
ttyout);
|
|
|
|
result = COMPLETE + 1;
|
|
|
|
}
|
1999-07-02 12:07:40 +04:00
|
|
|
if (result != COMPLETE)
|
|
|
|
result = command(pasvcmd = "LPSV");
|
|
|
|
break;
|
|
|
|
default:
|
1999-07-20 21:52:03 +04:00
|
|
|
result = COMPLETE + 1;
|
1999-07-12 00:37:39 +04:00
|
|
|
break;
|
1999-07-02 12:07:40 +04:00
|
|
|
}
|
|
|
|
if (result != COMPLETE) {
|
1998-06-04 12:28:35 +04:00
|
|
|
if (activefallback) {
|
|
|
|
(void)close(data);
|
|
|
|
data = -1;
|
|
|
|
passivemode = 0;
|
|
|
|
activefallback = 0;
|
|
|
|
goto reinit;
|
|
|
|
}
|
|
|
|
fputs("Passive mode refused.\n", ttyout);
|
1994-08-25 08:27:41 +04:00
|
|
|
goto bad;
|
|
|
|
}
|
|
|
|
|
1999-07-02 12:07:40 +04:00
|
|
|
#define pack2(var, off) \
|
|
|
|
(((var[(off) + 0] & 0xff) << 8) | ((var[(off) + 1] & 0xff) << 0))
|
|
|
|
#define pack4(var, off) \
|
|
|
|
(((var[(off) + 0] & 0xff) << 24) | ((var[(off) + 1] & 0xff) << 16) | \
|
|
|
|
((var[(off) + 2] & 0xff) << 8) | ((var[(off) + 3] & 0xff) << 0))
|
|
|
|
|
1994-08-25 08:27:41 +04:00
|
|
|
/*
|
1999-07-02 12:07:40 +04:00
|
|
|
* What we've got at this point is a string of comma separated
|
|
|
|
* one-byte unsigned integer values, separated by commas.
|
1994-08-25 08:27:41 +04:00
|
|
|
*/
|
1999-07-14 01:43:31 +04:00
|
|
|
if (strcmp(pasvcmd, "PASV") == 0) {
|
|
|
|
if (data_addr.su_family != AF_INET) {
|
|
|
|
fputs(
|
|
|
|
"Passive mode AF mismatch. Shouldn't happen!\n", ttyout);
|
|
|
|
error = 1;
|
|
|
|
goto bad;
|
|
|
|
}
|
1999-07-18 02:39:18 +04:00
|
|
|
if (code / 10 == 22 && code != 227) {
|
1999-07-14 01:43:31 +04:00
|
|
|
fputs("wrong server: return code must be 227\n",
|
|
|
|
ttyout);
|
|
|
|
error = 1;
|
|
|
|
goto bad;
|
|
|
|
}
|
|
|
|
error = sscanf(pasv, "%u,%u,%u,%u,%u,%u",
|
|
|
|
&addr[0], &addr[1], &addr[2], &addr[3],
|
|
|
|
&port[0], &port[1]);
|
|
|
|
if (error != 6) {
|
|
|
|
fputs(
|
|
|
|
"Passive mode address scan failure. Shouldn't happen!\n", ttyout);
|
|
|
|
error = 1;
|
|
|
|
goto bad;
|
|
|
|
}
|
|
|
|
error = 0;
|
|
|
|
memset(&data_addr, 0, sizeof(data_addr));
|
|
|
|
data_addr.su_family = AF_INET;
|
|
|
|
data_addr.su_len = sizeof(struct sockaddr_in);
|
|
|
|
data_addr.su_sin.sin_addr.s_addr =
|
|
|
|
htonl(pack4(addr, 0));
|
|
|
|
data_addr.su_port = htons(pack2(port, 0));
|
|
|
|
} else if (strcmp(pasvcmd, "LPSV") == 0) {
|
1999-07-18 02:39:18 +04:00
|
|
|
if (code / 10 == 22 && code != 228) {
|
1999-07-14 01:43:31 +04:00
|
|
|
fputs("wrong server: return code must be 228\n",
|
|
|
|
ttyout);
|
|
|
|
error = 1;
|
|
|
|
goto bad;
|
|
|
|
}
|
1999-07-02 12:07:40 +04:00
|
|
|
switch (data_addr.su_family) {
|
|
|
|
case AF_INET:
|
1999-07-14 01:43:31 +04:00
|
|
|
error = sscanf(pasv,
|
|
|
|
"%u,%u,%u,%u,%u,%u,%u,%u,%u",
|
1999-07-20 21:52:03 +04:00
|
|
|
&af, &hal,
|
1999-07-14 01:43:31 +04:00
|
|
|
&addr[0], &addr[1], &addr[2], &addr[3],
|
|
|
|
&pal, &port[0], &port[1]);
|
1999-07-20 21:52:03 +04:00
|
|
|
if (error != 9) {
|
1999-07-14 01:43:31 +04:00
|
|
|
fputs(
|
1999-07-20 21:52:03 +04:00
|
|
|
"Passive mode address scan failure. Shouldn't happen!\n", ttyout);
|
1999-07-14 01:43:31 +04:00
|
|
|
error = 1;
|
|
|
|
goto bad;
|
|
|
|
}
|
1999-07-20 21:52:03 +04:00
|
|
|
if (af != 4 || hal != 4 || pal != 2) {
|
1999-07-02 12:07:40 +04:00
|
|
|
fputs(
|
1999-07-20 21:52:03 +04:00
|
|
|
"Passive mode AF mismatch. Shouldn't happen!\n", ttyout);
|
1999-07-02 12:07:40 +04:00
|
|
|
error = 1;
|
|
|
|
goto bad;
|
|
|
|
}
|
1999-07-20 21:52:03 +04:00
|
|
|
|
1999-07-02 12:07:40 +04:00
|
|
|
error = 0;
|
|
|
|
memset(&data_addr, 0, sizeof(data_addr));
|
|
|
|
data_addr.su_family = AF_INET;
|
|
|
|
data_addr.su_len = sizeof(struct sockaddr_in);
|
|
|
|
data_addr.su_sin.sin_addr.s_addr =
|
|
|
|
htonl(pack4(addr, 0));
|
|
|
|
data_addr.su_port = htons(pack2(port, 0));
|
|
|
|
break;
|
|
|
|
case AF_INET6:
|
|
|
|
error = sscanf(pasv,
|
|
|
|
"%u,%u,%u,%u,%u,%u,%u,%u,%u,%u,%u,%u,%u,%u,%u,%u,%u,%u,%u,%u,%u",
|
|
|
|
&af, &hal,
|
|
|
|
&addr[0], &addr[1], &addr[2], &addr[3],
|
|
|
|
&addr[4], &addr[5], &addr[6], &addr[7],
|
|
|
|
&addr[8], &addr[9], &addr[10],
|
|
|
|
&addr[11], &addr[12], &addr[13],
|
|
|
|
&addr[14], &addr[15],
|
|
|
|
&pal, &port[0], &port[1]);
|
1999-07-20 21:52:03 +04:00
|
|
|
if (error != 21) {
|
1999-07-02 12:07:40 +04:00
|
|
|
fputs(
|
1999-07-20 21:52:03 +04:00
|
|
|
"Passive mode address scan failure. Shouldn't happen!\n", ttyout);
|
1999-07-02 12:07:40 +04:00
|
|
|
error = 1;
|
|
|
|
goto bad;
|
|
|
|
}
|
1999-07-20 21:52:03 +04:00
|
|
|
if (af != 6 || hal != 16 || pal != 2) {
|
1999-07-02 12:07:40 +04:00
|
|
|
fputs(
|
1999-07-20 21:52:03 +04:00
|
|
|
"Passive mode AF mismatch. Shouldn't happen!\n", ttyout);
|
1999-07-02 12:07:40 +04:00
|
|
|
error = 1;
|
|
|
|
goto bad;
|
|
|
|
}
|
1994-08-25 08:27:41 +04:00
|
|
|
|
1999-07-02 12:07:40 +04:00
|
|
|
error = 0;
|
|
|
|
memset(&data_addr, 0, sizeof(data_addr));
|
|
|
|
data_addr.su_family = AF_INET6;
|
|
|
|
data_addr.su_len = sizeof(struct sockaddr_in6);
|
1999-09-03 08:29:57 +04:00
|
|
|
{
|
|
|
|
u_int32_t *p32;
|
|
|
|
p32 = (u_int32_t *)&data_addr.su_sin6.sin6_addr;
|
|
|
|
p32[0] = htonl(pack4(addr, 0));
|
|
|
|
p32[1] = htonl(pack4(addr, 4));
|
|
|
|
p32[2] = htonl(pack4(addr, 8));
|
|
|
|
p32[3] = htonl(pack4(addr, 12));
|
|
|
|
}
|
1999-07-02 12:07:40 +04:00
|
|
|
data_addr.su_port = htons(pack2(port, 0));
|
|
|
|
break;
|
|
|
|
default:
|
|
|
|
error = 1;
|
|
|
|
}
|
|
|
|
} else if (strcmp(pasvcmd, "EPSV") == 0) {
|
|
|
|
char delim[4];
|
|
|
|
|
|
|
|
port[0] = 0;
|
1999-07-18 02:39:18 +04:00
|
|
|
if (code / 10 == 22 && code != 229) {
|
1999-07-14 01:43:31 +04:00
|
|
|
fputs("wrong server: return code must be 229\n",
|
|
|
|
ttyout);
|
|
|
|
error = 1;
|
|
|
|
goto bad;
|
|
|
|
}
|
1999-07-02 12:07:40 +04:00
|
|
|
if (sscanf(pasv, "%c%c%c%d%c", &delim[0],
|
|
|
|
&delim[1], &delim[2], &port[1],
|
|
|
|
&delim[3]) != 5) {
|
1999-07-20 21:52:03 +04:00
|
|
|
fputs("parse error!\n", ttyout);
|
|
|
|
error = 1;
|
1999-07-02 12:07:40 +04:00
|
|
|
goto bad;
|
|
|
|
}
|
|
|
|
if (delim[0] != delim[1] || delim[0] != delim[2]
|
|
|
|
|| delim[0] != delim[3]) {
|
1999-07-20 21:52:03 +04:00
|
|
|
fputs("parse error!\n", ttyout);
|
|
|
|
error = 1;
|
1999-07-02 12:07:40 +04:00
|
|
|
goto bad;
|
|
|
|
}
|
|
|
|
data_addr = hisctladdr;
|
|
|
|
data_addr.su_port = htons(port[1]);
|
|
|
|
} else
|
1994-08-25 08:27:41 +04:00
|
|
|
goto bad;
|
|
|
|
|
1998-07-10 08:39:03 +04:00
|
|
|
while (xconnect(data, (struct sockaddr *)&data_addr,
|
1999-07-02 12:07:40 +04:00
|
|
|
data_addr.su_len) < 0) {
|
1998-06-04 12:28:35 +04:00
|
|
|
if (errno == EINTR)
|
|
|
|
continue;
|
1999-01-06 02:33:44 +03:00
|
|
|
if (activefallback) {
|
|
|
|
(void)close(data);
|
|
|
|
data = -1;
|
|
|
|
passivemode = 0;
|
|
|
|
activefallback = 0;
|
|
|
|
goto reinit;
|
|
|
|
}
|
1996-12-29 07:05:29 +03:00
|
|
|
warn("connect");
|
1994-08-25 08:27:41 +04:00
|
|
|
goto bad;
|
|
|
|
}
|
1999-07-02 12:07:40 +04:00
|
|
|
#if defined(IPPROTO_IP) && defined(IP_TOS)
|
|
|
|
if (data_addr.su_family == AF_INET) {
|
|
|
|
on = IPTOS_THROUGHPUT;
|
|
|
|
if (setsockopt(data, IPPROTO_IP, IP_TOS, (char *)&on,
|
|
|
|
sizeof(int)) < 0)
|
|
|
|
warn("setsockopt TOS (ignored)");
|
|
|
|
}
|
1994-08-25 08:27:41 +04:00
|
|
|
#endif
|
1997-01-19 17:19:02 +03:00
|
|
|
return (0);
|
1994-08-25 08:27:41 +04:00
|
|
|
}
|
1993-03-21 12:45:37 +03:00
|
|
|
|
|
|
|
noport:
|
|
|
|
data_addr = myctladdr;
|
|
|
|
if (sendport)
|
1999-07-02 12:07:40 +04:00
|
|
|
data_addr.su_port = 0; /* let system pick one */
|
1993-03-21 12:45:37 +03:00
|
|
|
if (data != -1)
|
1997-03-13 09:23:11 +03:00
|
|
|
(void)close(data);
|
1999-07-02 12:07:40 +04:00
|
|
|
data = socket(data_addr.su_family, SOCK_STREAM, 0);
|
1993-03-21 12:45:37 +03:00
|
|
|
if (data < 0) {
|
1994-08-25 07:47:50 +04:00
|
|
|
warn("socket");
|
1993-03-21 12:45:37 +03:00
|
|
|
if (tmpno)
|
|
|
|
sendport = 1;
|
|
|
|
return (1);
|
|
|
|
}
|
|
|
|
if (!sendport)
|
1996-11-28 06:12:28 +03:00
|
|
|
if (setsockopt(data, SOL_SOCKET, SO_REUSEADDR, (char *)&on,
|
1997-03-13 09:23:11 +03:00
|
|
|
sizeof(on)) < 0) {
|
1994-08-25 07:47:50 +04:00
|
|
|
warn("setsockopt (reuse address)");
|
1993-03-21 12:45:37 +03:00
|
|
|
goto bad;
|
|
|
|
}
|
1999-07-02 12:07:40 +04:00
|
|
|
if (bind(data, (struct sockaddr *)&data_addr, data_addr.su_len) < 0) {
|
1994-08-25 07:47:50 +04:00
|
|
|
warn("bind");
|
1993-03-21 12:45:37 +03:00
|
|
|
goto bad;
|
|
|
|
}
|
|
|
|
if (options & SO_DEBUG &&
|
1996-11-28 06:12:28 +03:00
|
|
|
setsockopt(data, SOL_SOCKET, SO_DEBUG, (char *)&on,
|
1997-03-13 09:23:11 +03:00
|
|
|
sizeof(on)) < 0)
|
1994-08-25 07:47:50 +04:00
|
|
|
warn("setsockopt (ignored)");
|
1997-03-13 09:23:11 +03:00
|
|
|
len = sizeof(data_addr);
|
1993-03-21 12:45:37 +03:00
|
|
|
if (getsockname(data, (struct sockaddr *)&data_addr, &len) < 0) {
|
1994-08-25 07:47:50 +04:00
|
|
|
warn("getsockname");
|
1993-03-21 12:45:37 +03:00
|
|
|
goto bad;
|
|
|
|
}
|
1998-07-10 08:39:03 +04:00
|
|
|
if (xlisten(data, 1) < 0)
|
1994-08-25 07:47:50 +04:00
|
|
|
warn("listen");
|
1999-07-02 12:07:40 +04:00
|
|
|
|
1993-03-21 12:45:37 +03:00
|
|
|
#define UC(b) (((int)b)&0xff)
|
1999-07-02 12:07:40 +04:00
|
|
|
|
|
|
|
if (sendport) {
|
1999-08-30 02:21:57 +04:00
|
|
|
#ifdef INET6
|
1999-07-02 12:07:40 +04:00
|
|
|
char hname[INET6_ADDRSTRLEN];
|
|
|
|
int af;
|
1999-08-30 02:21:57 +04:00
|
|
|
#endif
|
1999-07-02 12:07:40 +04:00
|
|
|
|
|
|
|
switch (data_addr.su_family) {
|
|
|
|
case AF_INET:
|
1999-07-12 00:37:39 +04:00
|
|
|
if (!epsv4) {
|
|
|
|
result = COMPLETE + 1;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
/* FALLTHROUGH */
|
1999-08-30 02:21:57 +04:00
|
|
|
#ifdef INET6
|
1999-07-02 12:07:40 +04:00
|
|
|
case AF_INET6:
|
|
|
|
af = (data_addr.su_family == AF_INET) ? 1 : 2;
|
|
|
|
if (getnameinfo((struct sockaddr *)&data_addr,
|
|
|
|
data_addr.su_len, hname, sizeof(hname),
|
|
|
|
NULL, 0, NI_NUMERICHOST)) {
|
|
|
|
result = ERROR;
|
|
|
|
} else {
|
|
|
|
result = command("EPRT |%d|%s|%d|",
|
|
|
|
af, hname, ntohs(data_addr.su_port));
|
|
|
|
}
|
|
|
|
break;
|
1999-08-30 02:21:57 +04:00
|
|
|
#endif
|
1999-07-02 12:07:40 +04:00
|
|
|
default:
|
|
|
|
result = COMPLETE + 1;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
if (result == COMPLETE)
|
|
|
|
goto skip_port;
|
|
|
|
|
|
|
|
switch (data_addr.su_family) {
|
|
|
|
case AF_INET:
|
|
|
|
a = (char *)&data_addr.su_sin.sin_addr;
|
|
|
|
p = (char *)&data_addr.su_port;
|
|
|
|
result = command("PORT %d,%d,%d,%d,%d,%d",
|
|
|
|
UC(a[0]), UC(a[1]), UC(a[2]), UC(a[3]),
|
|
|
|
UC(p[0]), UC(p[1]));
|
|
|
|
break;
|
1999-08-30 02:21:57 +04:00
|
|
|
#ifdef INET6
|
1999-07-02 12:07:40 +04:00
|
|
|
case AF_INET6:
|
|
|
|
a = (char *)&data_addr.su_sin6.sin6_addr;
|
|
|
|
p = (char *)&data_addr.su_port;
|
|
|
|
result = command(
|
|
|
|
"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(a[0]),UC(a[1]),UC(a[2]),UC(a[3]),
|
|
|
|
UC(a[4]),UC(a[5]),UC(a[6]),UC(a[7]),
|
|
|
|
UC(a[8]),UC(a[9]),UC(a[10]),UC(a[11]),
|
|
|
|
UC(a[12]),UC(a[13]),UC(a[14]),UC(a[15]),
|
|
|
|
2, UC(p[0]), UC(p[1]));
|
|
|
|
break;
|
1999-08-30 02:21:57 +04:00
|
|
|
#endif
|
1999-07-02 12:07:40 +04:00
|
|
|
default:
|
|
|
|
result = COMPLETE + 1; /* xxx */
|
|
|
|
}
|
|
|
|
skip_port:
|
|
|
|
|
1993-03-21 12:45:37 +03:00
|
|
|
if (result == ERROR && sendport == -1) {
|
|
|
|
sendport = 0;
|
|
|
|
tmpno = 1;
|
|
|
|
goto noport;
|
|
|
|
}
|
|
|
|
return (result != COMPLETE);
|
|
|
|
}
|
|
|
|
if (tmpno)
|
|
|
|
sendport = 1;
|
1999-07-02 12:07:40 +04:00
|
|
|
#if defined(IPPROTO_IP) && defined(IP_TOS)
|
|
|
|
if (data_addr.su_family == AF_INET) {
|
|
|
|
on = IPTOS_THROUGHPUT;
|
|
|
|
if (setsockopt(data, IPPROTO_IP, IP_TOS, (char *)&on,
|
|
|
|
sizeof(int)) < 0)
|
|
|
|
warn("setsockopt TOS (ignored)");
|
|
|
|
}
|
1993-03-21 12:45:37 +03:00
|
|
|
#endif
|
|
|
|
return (0);
|
|
|
|
bad:
|
1997-03-13 09:23:11 +03:00
|
|
|
(void)close(data), data = -1;
|
1993-03-21 12:45:37 +03:00
|
|
|
if (tmpno)
|
|
|
|
sendport = 1;
|
|
|
|
return (1);
|
|
|
|
}
|
|
|
|
|
|
|
|
FILE *
|
|
|
|
dataconn(lmode)
|
1996-11-28 06:12:28 +03:00
|
|
|
const char *lmode;
|
1993-03-21 12:45:37 +03:00
|
|
|
{
|
1999-07-02 12:07:40 +04:00
|
|
|
union sockunion from;
|
|
|
|
int s, fromlen = myctladdr.su_len;
|
1993-03-21 12:45:37 +03:00
|
|
|
|
1994-08-25 08:27:41 +04:00
|
|
|
if (passivemode)
|
|
|
|
return (fdopen(data, lmode));
|
|
|
|
|
1993-03-21 12:45:37 +03:00
|
|
|
s = accept(data, (struct sockaddr *) &from, &fromlen);
|
|
|
|
if (s < 0) {
|
1994-08-25 07:47:50 +04:00
|
|
|
warn("accept");
|
1997-03-13 09:23:11 +03:00
|
|
|
(void)close(data), data = -1;
|
1993-03-21 12:45:37 +03:00
|
|
|
return (NULL);
|
|
|
|
}
|
1997-03-13 09:23:11 +03:00
|
|
|
(void)close(data);
|
1993-03-21 12:45:37 +03:00
|
|
|
data = s;
|
1999-07-02 12:07:40 +04:00
|
|
|
#if defined(IPPROTO_IP) && defined(IP_TOS)
|
|
|
|
if (from.su_family == AF_INET) {
|
|
|
|
int tos = IPTOS_THROUGHPUT;
|
|
|
|
if (setsockopt(s, IPPROTO_IP, IP_TOS, (char *)&tos,
|
|
|
|
sizeof(int)) < 0) {
|
|
|
|
warn("setsockopt TOS (ignored)");
|
|
|
|
}
|
|
|
|
}
|
1993-03-21 12:45:37 +03:00
|
|
|
#endif
|
|
|
|
return (fdopen(data, lmode));
|
|
|
|
}
|
|
|
|
|
1996-11-25 08:13:18 +03:00
|
|
|
void
|
|
|
|
psummary(notused)
|
|
|
|
int notused;
|
|
|
|
{
|
[fear this; more ftp hacking from lukem :-]
features:
---------
* transfer rate throttling with the new `rate' command. syntax:
rate direction [max [incr]]
where direction is `all', `get' or `put'.
if max is not supplied, the current settings are displayed.
if max is supplied, then transfers in the given direction will
be throttled to this value.
if incr is supplied, the increment for the `on-the-fly' scaling
will be set to that, otherwise `1024' is used.
currently implemented for binary get, binary put, and url fetches.
not yet supported for ascii get or put, or local file copies.
* on-the-fly scaling of the throttle based on signals:
- SIGUSR1 raises the throttle rate by the increment for that direction
- SIGUSR2 lowers the throttle rate by the increment for that direction
* -T dir,max[,incr] option to set rate from the command line
* `k', `m', `g' suffix support for bytecounts in the `hash', `rate',
`rcvbuf' and `sndbuf' commands)
bug fixes and code mods:
------------------------
* fix up ftp_login() so that ruserpass() is always called, even for
command-line url fetches.
* implement strsuftoi(), which parses a given number into a int with
suffix support. replaces getsockbufsize()
* implement parserate(), which does the argv parsing for -T and rate
* save and restore errno in signal handlers (may not be necessary, but
it doesn't hurt)
notes:
------
the rate command has had reasonable testing, but I'd like feedback
if it doesn't do the right thing, especially from people on slower
(i.e, modem) links.
I haven't tested the rate throttle against a http server which does
`transfer-encoding: chunked' because I couldn't find a server to
test against.
1999-06-29 14:43:16 +04:00
|
|
|
int oerrno;
|
1996-12-06 05:06:46 +03:00
|
|
|
|
[fear this; more ftp hacking from lukem :-]
features:
---------
* transfer rate throttling with the new `rate' command. syntax:
rate direction [max [incr]]
where direction is `all', `get' or `put'.
if max is not supplied, the current settings are displayed.
if max is supplied, then transfers in the given direction will
be throttled to this value.
if incr is supplied, the increment for the `on-the-fly' scaling
will be set to that, otherwise `1024' is used.
currently implemented for binary get, binary put, and url fetches.
not yet supported for ascii get or put, or local file copies.
* on-the-fly scaling of the throttle based on signals:
- SIGUSR1 raises the throttle rate by the increment for that direction
- SIGUSR2 lowers the throttle rate by the increment for that direction
* -T dir,max[,incr] option to set rate from the command line
* `k', `m', `g' suffix support for bytecounts in the `hash', `rate',
`rcvbuf' and `sndbuf' commands)
bug fixes and code mods:
------------------------
* fix up ftp_login() so that ruserpass() is always called, even for
command-line url fetches.
* implement strsuftoi(), which parses a given number into a int with
suffix support. replaces getsockbufsize()
* implement parserate(), which does the argv parsing for -T and rate
* save and restore errno in signal handlers (may not be necessary, but
it doesn't hurt)
notes:
------
the rate command has had reasonable testing, but I'd like feedback
if it doesn't do the right thing, especially from people on slower
(i.e, modem) links.
I haven't tested the rate throttle against a http server which does
`transfer-encoding: chunked' because I couldn't find a server to
test against.
1999-06-29 14:43:16 +04:00
|
|
|
oerrno = errno;
|
1996-11-25 08:13:18 +03:00
|
|
|
if (bytes > 0)
|
1996-12-06 05:06:46 +03:00
|
|
|
ptransfer(1);
|
[fear this; more ftp hacking from lukem :-]
features:
---------
* transfer rate throttling with the new `rate' command. syntax:
rate direction [max [incr]]
where direction is `all', `get' or `put'.
if max is not supplied, the current settings are displayed.
if max is supplied, then transfers in the given direction will
be throttled to this value.
if incr is supplied, the increment for the `on-the-fly' scaling
will be set to that, otherwise `1024' is used.
currently implemented for binary get, binary put, and url fetches.
not yet supported for ascii get or put, or local file copies.
* on-the-fly scaling of the throttle based on signals:
- SIGUSR1 raises the throttle rate by the increment for that direction
- SIGUSR2 lowers the throttle rate by the increment for that direction
* -T dir,max[,incr] option to set rate from the command line
* `k', `m', `g' suffix support for bytecounts in the `hash', `rate',
`rcvbuf' and `sndbuf' commands)
bug fixes and code mods:
------------------------
* fix up ftp_login() so that ruserpass() is always called, even for
command-line url fetches.
* implement strsuftoi(), which parses a given number into a int with
suffix support. replaces getsockbufsize()
* implement parserate(), which does the argv parsing for -T and rate
* save and restore errno in signal handlers (may not be necessary, but
it doesn't hurt)
notes:
------
the rate command has had reasonable testing, but I'd like feedback
if it doesn't do the right thing, especially from people on slower
(i.e, modem) links.
I haven't tested the rate throttle against a http server which does
`transfer-encoding: chunked' because I couldn't find a server to
test against.
1999-06-29 14:43:16 +04:00
|
|
|
errno = oerrno;
|
1996-11-25 08:13:18 +03:00
|
|
|
}
|
|
|
|
|
1993-03-21 12:45:37 +03:00
|
|
|
void
|
1997-03-13 09:23:11 +03:00
|
|
|
psabort(notused)
|
|
|
|
int notused;
|
1993-03-21 12:45:37 +03:00
|
|
|
{
|
|
|
|
|
[Yet Another Huge Ftp Commit - hopefully the last for a while,
barring any more little things people want added ...]
New features:
* progressmeter is now asynchronous, so "stalled" transfers can be
detected. "- stalled -" is displayed instead of the ETA in this case.
When the xfer resumes, the time that the xfer was stalled for is
factored out of the ETA. It is debatable whether this is better than
not factoring it out, but I like it this way (I.e, if it stalls for 8
seconds and the ETA was 30 seconds, when it resumes the ETA will still
be 30 seconds).
* verbosity can be disabled on the command line (-V), so that in auto-fetch
mode the only lines displayed will be a description of the file, and
the progress bar (if possible)
* if the screen is resized (and detected via the SIGWINCH signal), the
progress bar will rescale automatically.
Bugs fixed:
* progress bar will not use the last character on the line, as this can
cause problems on some terminals
* screen dimensions (via ioctl(TIOCWINSZ)) should use stdout not stdin
* progressmeter() used some vars before initialising them
* ^D will quit now. [fixes bin/3162]
* use hstrerror() to generate error message for host name lookup failure.
* use getcwd instead of getwd (it should have been OK, but why tempt fate?)
* auto-fetch transfers will always return a positive exit value upon failure
or interruption, relative to the file's position in argv[].
* remote completion of / will work, without putting a leading "///".
This is actually a bug in ftpd(1), where "NLST /" prefixes all names
with "//", but fixing every ftpd(1) is not an option...
1997-02-01 13:44:54 +03:00
|
|
|
alarmtimer(0);
|
1993-03-21 12:45:37 +03:00
|
|
|
abrtflag++;
|
|
|
|
}
|
|
|
|
|
1994-08-25 07:47:50 +04:00
|
|
|
void
|
1993-03-21 12:45:37 +03:00
|
|
|
pswitch(flag)
|
|
|
|
int flag;
|
|
|
|
{
|
|
|
|
sig_t oldintr;
|
|
|
|
static struct comvars {
|
|
|
|
int connect;
|
|
|
|
char name[MAXHOSTNAMELEN];
|
1999-07-02 12:07:40 +04:00
|
|
|
union sockunion mctl;
|
|
|
|
union sockunion hctl;
|
1993-03-21 12:45:37 +03:00
|
|
|
FILE *in;
|
|
|
|
FILE *out;
|
|
|
|
int tpe;
|
|
|
|
int curtpe;
|
|
|
|
int cpnd;
|
|
|
|
int sunqe;
|
|
|
|
int runqe;
|
|
|
|
int mcse;
|
|
|
|
int ntflg;
|
|
|
|
char nti[17];
|
|
|
|
char nto[17];
|
|
|
|
int mapflg;
|
|
|
|
char mi[MAXPATHLEN];
|
|
|
|
char mo[MAXPATHLEN];
|
|
|
|
} proxstruct, tmpstruct;
|
|
|
|
struct comvars *ip, *op;
|
|
|
|
|
|
|
|
abrtflag = 0;
|
|
|
|
oldintr = signal(SIGINT, psabort);
|
|
|
|
if (flag) {
|
|
|
|
if (proxy)
|
|
|
|
return;
|
|
|
|
ip = &tmpstruct;
|
|
|
|
op = &proxstruct;
|
|
|
|
proxy++;
|
|
|
|
} else {
|
|
|
|
if (!proxy)
|
|
|
|
return;
|
|
|
|
ip = &proxstruct;
|
|
|
|
op = &tmpstruct;
|
|
|
|
proxy = 0;
|
|
|
|
}
|
|
|
|
ip->connect = connected;
|
|
|
|
connected = op->connect;
|
|
|
|
if (hostname) {
|
1997-03-13 09:23:11 +03:00
|
|
|
(void)strncpy(ip->name, hostname, sizeof(ip->name) - 1);
|
|
|
|
ip->name[sizeof(ip->name) - 1] = '\0';
|
1993-03-21 12:45:37 +03:00
|
|
|
} else
|
1997-03-13 09:23:11 +03:00
|
|
|
ip->name[0] = '\0';
|
1993-03-21 12:45:37 +03:00
|
|
|
hostname = op->name;
|
|
|
|
ip->hctl = hisctladdr;
|
|
|
|
hisctladdr = op->hctl;
|
|
|
|
ip->mctl = myctladdr;
|
|
|
|
myctladdr = op->mctl;
|
|
|
|
ip->in = cin;
|
|
|
|
cin = op->in;
|
|
|
|
ip->out = cout;
|
|
|
|
cout = op->out;
|
|
|
|
ip->tpe = type;
|
|
|
|
type = op->tpe;
|
|
|
|
ip->curtpe = curtype;
|
|
|
|
curtype = op->curtpe;
|
|
|
|
ip->cpnd = cpend;
|
|
|
|
cpend = op->cpnd;
|
|
|
|
ip->sunqe = sunique;
|
|
|
|
sunique = op->sunqe;
|
|
|
|
ip->runqe = runique;
|
|
|
|
runique = op->runqe;
|
|
|
|
ip->mcse = mcase;
|
|
|
|
mcase = op->mcse;
|
|
|
|
ip->ntflg = ntflag;
|
|
|
|
ntflag = op->ntflg;
|
1997-03-13 09:23:11 +03:00
|
|
|
(void)strncpy(ip->nti, ntin, sizeof(ip->nti) - 1);
|
|
|
|
(ip->nti)[sizeof(ip->nti) - 1] = '\0';
|
|
|
|
(void)strcpy(ntin, op->nti);
|
|
|
|
(void)strncpy(ip->nto, ntout, sizeof(ip->nto) - 1);
|
|
|
|
(ip->nto)[sizeof(ip->nto) - 1] = '\0';
|
|
|
|
(void)strcpy(ntout, op->nto);
|
1993-03-21 12:45:37 +03:00
|
|
|
ip->mapflg = mapflag;
|
|
|
|
mapflag = op->mapflg;
|
1997-03-13 09:23:11 +03:00
|
|
|
(void)strncpy(ip->mi, mapin, sizeof(ip->mi) - 1);
|
|
|
|
(ip->mi)[sizeof(ip->mi) - 1] = '\0';
|
|
|
|
(void)strcpy(mapin, op->mi);
|
|
|
|
(void)strncpy(ip->mo, mapout, sizeof(ip->mo) - 1);
|
|
|
|
(ip->mo)[sizeof(ip->mo) - 1] = '\0';
|
|
|
|
(void)strcpy(mapout, op->mo);
|
|
|
|
(void)signal(SIGINT, oldintr);
|
1993-03-21 12:45:37 +03:00
|
|
|
if (abrtflag) {
|
|
|
|
abrtflag = 0;
|
|
|
|
(*oldintr)(SIGINT);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
void
|
1997-03-13 09:23:11 +03:00
|
|
|
abortpt(notused)
|
|
|
|
int notused;
|
1993-03-21 12:45:37 +03:00
|
|
|
{
|
1994-08-25 07:47:50 +04:00
|
|
|
|
[Yet Another Huge Ftp Commit - hopefully the last for a while,
barring any more little things people want added ...]
New features:
* progressmeter is now asynchronous, so "stalled" transfers can be
detected. "- stalled -" is displayed instead of the ETA in this case.
When the xfer resumes, the time that the xfer was stalled for is
factored out of the ETA. It is debatable whether this is better than
not factoring it out, but I like it this way (I.e, if it stalls for 8
seconds and the ETA was 30 seconds, when it resumes the ETA will still
be 30 seconds).
* verbosity can be disabled on the command line (-V), so that in auto-fetch
mode the only lines displayed will be a description of the file, and
the progress bar (if possible)
* if the screen is resized (and detected via the SIGWINCH signal), the
progress bar will rescale automatically.
Bugs fixed:
* progress bar will not use the last character on the line, as this can
cause problems on some terminals
* screen dimensions (via ioctl(TIOCWINSZ)) should use stdout not stdin
* progressmeter() used some vars before initialising them
* ^D will quit now. [fixes bin/3162]
* use hstrerror() to generate error message for host name lookup failure.
* use getcwd instead of getwd (it should have been OK, but why tempt fate?)
* auto-fetch transfers will always return a positive exit value upon failure
or interruption, relative to the file's position in argv[].
* remote completion of / will work, without putting a leading "///".
This is actually a bug in ftpd(1), where "NLST /" prefixes all names
with "//", but fixing every ftpd(1) is not an option...
1997-02-01 13:44:54 +03:00
|
|
|
alarmtimer(0);
|
1998-06-04 12:28:35 +04:00
|
|
|
putc('\n', ttyout);
|
1993-03-21 12:45:37 +03:00
|
|
|
ptabflg++;
|
|
|
|
mflag = 0;
|
|
|
|
abrtflag = 0;
|
|
|
|
longjmp(ptabort, 1);
|
|
|
|
}
|
|
|
|
|
1994-08-25 07:47:50 +04:00
|
|
|
void
|
1993-03-21 12:45:37 +03:00
|
|
|
proxtrans(cmd, local, remote)
|
1996-11-28 06:12:28 +03:00
|
|
|
const char *cmd, *local, *remote;
|
1993-03-21 12:45:37 +03:00
|
|
|
{
|
|
|
|
sig_t oldintr;
|
1997-07-20 13:45:35 +04:00
|
|
|
int prox_type, nfnd;
|
|
|
|
volatile int secndflag;
|
1993-03-21 12:45:37 +03:00
|
|
|
char *cmd2;
|
|
|
|
|
1998-06-04 12:28:35 +04:00
|
|
|
#ifdef __GNUC__ /* to shut up gcc warnings */
|
1997-07-20 13:45:35 +04:00
|
|
|
(void)&oldintr;
|
|
|
|
(void)&cmd2;
|
|
|
|
#endif
|
|
|
|
|
|
|
|
oldintr = NULL;
|
|
|
|
secndflag = 0;
|
1993-03-21 12:45:37 +03:00
|
|
|
if (strcmp(cmd, "RETR"))
|
|
|
|
cmd2 = "RETR";
|
|
|
|
else
|
|
|
|
cmd2 = runique ? "STOU" : "STOR";
|
|
|
|
if ((prox_type = type) == 0) {
|
|
|
|
if (unix_server && unix_proxy)
|
|
|
|
prox_type = TYPE_I;
|
|
|
|
else
|
|
|
|
prox_type = TYPE_A;
|
|
|
|
}
|
|
|
|
if (curtype != prox_type)
|
|
|
|
changetype(prox_type, 1);
|
|
|
|
if (command("PASV") != COMPLETE) {
|
1998-06-04 12:28:35 +04:00
|
|
|
fputs("proxy server does not support third party transfers.\n",
|
|
|
|
ttyout);
|
1993-03-21 12:45:37 +03:00
|
|
|
return;
|
|
|
|
}
|
|
|
|
pswitch(0);
|
|
|
|
if (!connected) {
|
1998-06-04 12:28:35 +04:00
|
|
|
fputs("No primary connection.\n", ttyout);
|
1993-03-21 12:45:37 +03:00
|
|
|
pswitch(1);
|
|
|
|
code = -1;
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
if (curtype != prox_type)
|
|
|
|
changetype(prox_type, 1);
|
|
|
|
if (command("PORT %s", pasv) != COMPLETE) {
|
|
|
|
pswitch(1);
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
if (setjmp(ptabort))
|
|
|
|
goto abort;
|
|
|
|
oldintr = signal(SIGINT, abortpt);
|
1999-02-19 19:29:27 +03:00
|
|
|
if ((restart_point &&
|
|
|
|
#ifndef NO_QUAD
|
|
|
|
(command("REST %qd", (long long) restart_point) != CONTINUE)
|
|
|
|
#else
|
|
|
|
(command("REST %ld", (long) restart_point) != CONTINUE)
|
|
|
|
#endif
|
|
|
|
) || (command("%s %s", cmd, remote) != PRELIM)) {
|
1997-03-13 09:23:11 +03:00
|
|
|
(void)signal(SIGINT, oldintr);
|
1993-03-21 12:45:37 +03:00
|
|
|
pswitch(1);
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
sleep(2);
|
|
|
|
pswitch(1);
|
|
|
|
secndflag++;
|
1999-02-19 19:29:27 +03:00
|
|
|
if ((restart_point &&
|
|
|
|
#ifndef NO_QUAD
|
|
|
|
(command("REST %qd", (long long) restart_point) != CONTINUE)
|
|
|
|
#else
|
|
|
|
(command("REST %ld", (long) restart_point) != CONTINUE)
|
|
|
|
#endif
|
|
|
|
) || (command("%s %s", cmd2, local) != PRELIM))
|
1993-03-21 12:45:37 +03:00
|
|
|
goto abort;
|
|
|
|
ptflag++;
|
1997-03-13 09:23:11 +03:00
|
|
|
(void)getreply(0);
|
1993-03-21 12:45:37 +03:00
|
|
|
pswitch(0);
|
1997-03-13 09:23:11 +03:00
|
|
|
(void)getreply(0);
|
|
|
|
(void)signal(SIGINT, oldintr);
|
1993-03-21 12:45:37 +03:00
|
|
|
pswitch(1);
|
|
|
|
ptflag = 0;
|
1998-06-04 12:28:35 +04:00
|
|
|
fprintf(ttyout, "local: %s remote: %s\n", local, remote);
|
1993-03-21 12:45:37 +03:00
|
|
|
return;
|
|
|
|
abort:
|
1997-03-13 09:23:11 +03:00
|
|
|
(void)signal(SIGINT, SIG_IGN);
|
1993-03-21 12:45:37 +03:00
|
|
|
ptflag = 0;
|
|
|
|
if (strcmp(cmd, "RETR") && !proxy)
|
|
|
|
pswitch(1);
|
|
|
|
else if (!strcmp(cmd, "RETR") && proxy)
|
|
|
|
pswitch(0);
|
|
|
|
if (!cpend && !secndflag) { /* only here if cmd = "STOR" (proxy=1) */
|
|
|
|
if (command("%s %s", cmd2, local) != PRELIM) {
|
|
|
|
pswitch(0);
|
|
|
|
if (cpend)
|
1998-01-18 17:23:33 +03:00
|
|
|
abort_remote(NULL);
|
1993-03-21 12:45:37 +03:00
|
|
|
}
|
|
|
|
pswitch(1);
|
|
|
|
if (ptabflg)
|
|
|
|
code = -1;
|
1997-03-13 09:23:11 +03:00
|
|
|
(void)signal(SIGINT, oldintr);
|
1993-03-21 12:45:37 +03:00
|
|
|
return;
|
|
|
|
}
|
|
|
|
if (cpend)
|
1998-01-18 17:23:33 +03:00
|
|
|
abort_remote(NULL);
|
1993-03-21 12:45:37 +03:00
|
|
|
pswitch(!proxy);
|
|
|
|
if (!cpend && !secndflag) { /* only if cmd = "RETR" (proxy=1) */
|
|
|
|
if (command("%s %s", cmd2, local) != PRELIM) {
|
|
|
|
pswitch(0);
|
|
|
|
if (cpend)
|
1998-01-18 17:23:33 +03:00
|
|
|
abort_remote(NULL);
|
1993-03-21 12:45:37 +03:00
|
|
|
pswitch(1);
|
|
|
|
if (ptabflg)
|
|
|
|
code = -1;
|
1997-03-13 09:23:11 +03:00
|
|
|
(void)signal(SIGINT, oldintr);
|
1993-03-21 12:45:37 +03:00
|
|
|
return;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if (cpend)
|
1998-01-18 17:23:33 +03:00
|
|
|
abort_remote(NULL);
|
1993-03-21 12:45:37 +03:00
|
|
|
pswitch(!proxy);
|
|
|
|
if (cpend) {
|
1999-06-24 18:50:56 +04:00
|
|
|
if ((nfnd = empty(cin, NULL, 10)) <= 0) {
|
1993-03-21 12:45:37 +03:00
|
|
|
if (nfnd < 0) {
|
1994-08-25 07:47:50 +04:00
|
|
|
warn("abort");
|
1993-03-21 12:45:37 +03:00
|
|
|
}
|
|
|
|
if (ptabflg)
|
|
|
|
code = -1;
|
|
|
|
lostpeer();
|
|
|
|
}
|
1997-03-13 09:23:11 +03:00
|
|
|
(void)getreply(0);
|
|
|
|
(void)getreply(0);
|
1993-03-21 12:45:37 +03:00
|
|
|
}
|
|
|
|
if (proxy)
|
|
|
|
pswitch(0);
|
|
|
|
pswitch(1);
|
|
|
|
if (ptabflg)
|
|
|
|
code = -1;
|
1997-03-13 09:23:11 +03:00
|
|
|
(void)signal(SIGINT, oldintr);
|
1993-03-21 12:45:37 +03:00
|
|
|
}
|
|
|
|
|
1994-08-25 07:47:50 +04:00
|
|
|
void
|
|
|
|
reset(argc, argv)
|
|
|
|
int argc;
|
|
|
|
char *argv[];
|
1993-03-21 12:45:37 +03:00
|
|
|
{
|
|
|
|
int nfnd = 1;
|
|
|
|
|
|
|
|
while (nfnd > 0) {
|
1999-06-24 18:50:56 +04:00
|
|
|
if ((nfnd = empty(cin, NULL, 0)) < 0) {
|
1994-08-25 07:47:50 +04:00
|
|
|
warn("reset");
|
1993-03-21 12:45:37 +03:00
|
|
|
code = -1;
|
|
|
|
lostpeer();
|
|
|
|
}
|
|
|
|
else if (nfnd) {
|
1997-03-13 09:23:11 +03:00
|
|
|
(void)getreply(0);
|
1993-03-21 12:45:37 +03:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
char *
|
|
|
|
gunique(local)
|
1996-11-28 06:12:28 +03:00
|
|
|
const char *local;
|
1993-03-21 12:45:37 +03:00
|
|
|
{
|
|
|
|
static char new[MAXPATHLEN];
|
1994-08-25 07:47:50 +04:00
|
|
|
char *cp = strrchr(local, '/');
|
1993-03-21 12:45:37 +03:00
|
|
|
int d, count=0;
|
|
|
|
char ext = '1';
|
|
|
|
|
|
|
|
if (cp)
|
|
|
|
*cp = '\0';
|
1997-09-13 13:05:52 +04:00
|
|
|
d = access(cp == local ? "/" : cp ? local : ".", W_OK);
|
1993-03-21 12:45:37 +03:00
|
|
|
if (cp)
|
|
|
|
*cp = '/';
|
|
|
|
if (d < 0) {
|
1994-08-25 07:47:50 +04:00
|
|
|
warn("local: %s", local);
|
1998-01-18 17:23:33 +03:00
|
|
|
return (NULL);
|
1993-03-21 12:45:37 +03:00
|
|
|
}
|
1997-03-13 09:23:11 +03:00
|
|
|
(void)strcpy(new, local);
|
1993-03-21 12:45:37 +03:00
|
|
|
cp = new + strlen(new);
|
|
|
|
*cp++ = '.';
|
|
|
|
while (!d) {
|
|
|
|
if (++count == 100) {
|
1998-06-04 12:28:35 +04:00
|
|
|
fputs("runique: can't find unique file name.\n",
|
|
|
|
ttyout);
|
1998-01-18 17:23:33 +03:00
|
|
|
return (NULL);
|
1993-03-21 12:45:37 +03:00
|
|
|
}
|
|
|
|
*cp++ = ext;
|
|
|
|
*cp = '\0';
|
|
|
|
if (ext == '9')
|
|
|
|
ext = '0';
|
|
|
|
else
|
|
|
|
ext++;
|
1997-09-13 13:05:52 +04:00
|
|
|
if ((d = access(new, F_OK)) < 0)
|
1993-03-21 12:45:37 +03:00
|
|
|
break;
|
|
|
|
if (ext != '0')
|
|
|
|
cp--;
|
|
|
|
else if (*(cp - 2) == '.')
|
|
|
|
*(cp - 1) = '1';
|
|
|
|
else {
|
|
|
|
*(cp - 2) = *(cp - 2) + 1;
|
|
|
|
cp--;
|
|
|
|
}
|
|
|
|
}
|
1994-08-25 07:47:50 +04:00
|
|
|
return (new);
|
1993-03-21 12:45:37 +03:00
|
|
|
}
|
|
|
|
|
1994-08-25 07:47:50 +04:00
|
|
|
void
|
1993-03-21 12:45:37 +03:00
|
|
|
abort_remote(din)
|
1994-08-25 07:47:50 +04:00
|
|
|
FILE *din;
|
1993-03-21 12:45:37 +03:00
|
|
|
{
|
|
|
|
char buf[BUFSIZ];
|
|
|
|
int nfnd;
|
|
|
|
|
1997-03-13 09:23:11 +03:00
|
|
|
if (cout == NULL) {
|
|
|
|
warnx("Lost control connection for abort.");
|
|
|
|
if (ptabflg)
|
|
|
|
code = -1;
|
|
|
|
lostpeer();
|
|
|
|
return;
|
|
|
|
}
|
1993-03-21 12:45:37 +03:00
|
|
|
/*
|
|
|
|
* send IAC in urgent mode instead of DM because 4.3BSD places oob mark
|
|
|
|
* after urgent byte rather than before as is protocol now
|
|
|
|
*/
|
1999-06-02 06:03:57 +04:00
|
|
|
snprintf(buf, sizeof(buf), "%c%c%c", IAC, IP, IAC);
|
1993-03-21 12:45:37 +03:00
|
|
|
if (send(fileno(cout), buf, 3, MSG_OOB) != 3)
|
1994-08-25 07:47:50 +04:00
|
|
|
warn("abort");
|
1996-11-28 06:12:28 +03:00
|
|
|
fprintf(cout, "%cABOR\r\n", DM);
|
1997-03-13 09:23:11 +03:00
|
|
|
(void)fflush(cout);
|
1999-06-24 18:50:56 +04:00
|
|
|
if ((nfnd = empty(cin, din, 10)) <= 0) {
|
1993-03-21 12:45:37 +03:00
|
|
|
if (nfnd < 0) {
|
1994-08-25 07:47:50 +04:00
|
|
|
warn("abort");
|
1993-03-21 12:45:37 +03:00
|
|
|
}
|
|
|
|
if (ptabflg)
|
|
|
|
code = -1;
|
|
|
|
lostpeer();
|
|
|
|
}
|
1999-06-24 18:50:56 +04:00
|
|
|
if (din && (nfnd & 2)) {
|
1993-03-21 12:45:37 +03:00
|
|
|
while (read(fileno(din), buf, BUFSIZ) > 0)
|
1999-06-24 18:50:56 +04:00
|
|
|
continue;
|
1993-03-21 12:45:37 +03:00
|
|
|
}
|
|
|
|
if (getreply(0) == ERROR && code == 552) {
|
|
|
|
/* 552 needed for nic style abort */
|
1997-03-13 09:23:11 +03:00
|
|
|
(void)getreply(0);
|
1993-03-21 12:45:37 +03:00
|
|
|
}
|
1997-03-13 09:23:11 +03:00
|
|
|
(void)getreply(0);
|
1993-03-21 12:45:37 +03:00
|
|
|
}
|