2002-06-08 18:44:07 +04:00
|
|
|
/* $NetBSD: util.c,v 1.108 2002/06/08 14:44:07 yamt Exp $ */
|
1998-07-10 08:39:03 +04:00
|
|
|
|
|
|
|
/*-
|
2002-06-05 14:20:46 +04:00
|
|
|
* Copyright (c) 1997-2002 The NetBSD Foundation, Inc.
|
1998-07-10 08:39:03 +04:00
|
|
|
* All rights reserved.
|
|
|
|
*
|
|
|
|
* This code is derived from software contributed to The NetBSD Foundation
|
1999-10-05 05:16:11 +04:00
|
|
|
* by Luke Mewburn.
|
1998-07-10 08:39:03 +04:00
|
|
|
*
|
1999-01-24 05:39:29 +03:00
|
|
|
* This code is derived from software contributed to The NetBSD Foundation
|
1999-10-05 05:16:11 +04:00
|
|
|
* by Jason R. Thorpe of the Numerical Aerospace Simulation Facility,
|
|
|
|
* NASA Ames Research Center.
|
1999-01-24 05:39:29 +03:00
|
|
|
*
|
1998-07-10 08:39:03 +04: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 NetBSD
|
|
|
|
* Foundation, Inc. and its contributors.
|
|
|
|
* 4. Neither the name of The NetBSD Foundation 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 NETBSD FOUNDATION, INC. 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 FOUNDATION 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-01-19 17:19:02 +03:00
|
|
|
|
|
|
|
/*
|
|
|
|
* Copyright (c) 1985, 1989, 1993, 1994
|
|
|
|
* The Regents of the University of California. 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. 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>
|
1997-01-19 17:19:02 +03:00
|
|
|
#ifndef lint
|
2002-06-08 18:44:07 +04:00
|
|
|
__RCSID("$NetBSD: util.c,v 1.108 2002/06/08 14:44:07 yamt Exp $");
|
1997-01-19 17:19:02 +03:00
|
|
|
#endif /* not lint */
|
|
|
|
|
|
|
|
/*
|
|
|
|
* FTP User Program -- Misc support routines
|
|
|
|
*/
|
1998-07-10 08:39:03 +04:00
|
|
|
#include <sys/types.h>
|
|
|
|
#include <sys/socket.h>
|
1997-01-19 17:19:02 +03:00
|
|
|
#include <sys/ioctl.h>
|
|
|
|
#include <sys/time.h>
|
1999-10-13 06:47:54 +04:00
|
|
|
#include <netinet/in.h>
|
1997-01-19 17:19:02 +03:00
|
|
|
#include <arpa/ftp.h>
|
|
|
|
|
|
|
|
#include <ctype.h>
|
|
|
|
#include <err.h>
|
[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
|
|
|
#include <errno.h>
|
1997-01-19 17:19:02 +03:00
|
|
|
#include <fcntl.h>
|
|
|
|
#include <glob.h>
|
1998-05-20 04:55:52 +04:00
|
|
|
#include <signal.h>
|
1997-07-20 13:45:35 +04:00
|
|
|
#include <limits.h>
|
2000-09-08 15:54:53 +04:00
|
|
|
#include <netdb.h>
|
1997-01-19 17:19:02 +03:00
|
|
|
#include <stdio.h>
|
1997-07-20 13:45:35 +04:00
|
|
|
#include <stdlib.h>
|
1997-01-19 17:19:02 +03:00
|
|
|
#include <string.h>
|
1999-09-29 04:44:01 +04:00
|
|
|
#include <termios.h>
|
1997-01-19 17:19:02 +03:00
|
|
|
#include <time.h>
|
1997-11-01 17:36:49 +03:00
|
|
|
#include <tzfile.h>
|
1997-01-19 17:19:02 +03:00
|
|
|
#include <unistd.h>
|
|
|
|
|
|
|
|
#include "ftp_var.h"
|
|
|
|
|
|
|
|
/*
|
2000-06-15 17:08:23 +04:00
|
|
|
* Connect to peer server and auto-login, if possible.
|
1997-01-19 17:19:02 +03:00
|
|
|
*/
|
|
|
|
void
|
2000-05-01 14:35:16 +04:00
|
|
|
setpeer(int argc, char *argv[])
|
1997-01-19 17:19:02 +03:00
|
|
|
{
|
|
|
|
char *host;
|
1999-07-02 12:07:40 +04:00
|
|
|
char *port;
|
1997-01-19 17:19:02 +03:00
|
|
|
|
1999-10-24 16:31:36 +04:00
|
|
|
if (argc == 0)
|
|
|
|
goto usage;
|
1997-01-19 17:19:02 +03:00
|
|
|
if (connected) {
|
1998-06-04 12:28:35 +04:00
|
|
|
fprintf(ttyout, "Already connected to %s, use close first.\n",
|
1997-03-13 09:23:11 +03:00
|
|
|
hostname);
|
1997-01-19 17:19:02 +03:00
|
|
|
code = -1;
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
if (argc < 2)
|
1997-03-13 09:23:11 +03:00
|
|
|
(void)another(&argc, &argv, "to");
|
1997-01-19 17:19:02 +03:00
|
|
|
if (argc < 2 || argc > 3) {
|
1999-10-24 16:31:36 +04:00
|
|
|
usage:
|
1998-06-04 12:28:35 +04:00
|
|
|
fprintf(ttyout, "usage: %s host-name [port]\n", argv[0]);
|
1997-01-19 17:19:02 +03:00
|
|
|
code = -1;
|
|
|
|
return;
|
|
|
|
}
|
1997-08-18 14:20:13 +04:00
|
|
|
if (gatemode)
|
|
|
|
port = gateport;
|
|
|
|
else
|
|
|
|
port = ftpport;
|
1999-07-02 12:07:40 +04:00
|
|
|
if (argc > 2)
|
1999-11-09 10:26:50 +03:00
|
|
|
port = argv[2];
|
1997-08-18 14:20:13 +04:00
|
|
|
|
|
|
|
if (gatemode) {
|
|
|
|
if (gateserver == NULL || *gateserver == '\0')
|
|
|
|
errx(1, "gateserver not defined (shouldn't happen)");
|
|
|
|
host = hookup(gateserver, port);
|
|
|
|
} else
|
|
|
|
host = hookup(argv[1], port);
|
|
|
|
|
1997-01-19 17:19:02 +03:00
|
|
|
if (host) {
|
1999-06-02 06:03:57 +04:00
|
|
|
if (gatemode && verbose) {
|
|
|
|
fprintf(ttyout,
|
|
|
|
"Connecting via pass-through server %s\n",
|
|
|
|
gateserver);
|
1997-08-18 14:20:13 +04:00
|
|
|
}
|
|
|
|
|
1997-01-19 17:19:02 +03:00
|
|
|
connected = 1;
|
|
|
|
/*
|
|
|
|
* Set up defaults for FTP.
|
|
|
|
*/
|
1999-09-28 10:47:38 +04:00
|
|
|
(void)strlcpy(typename, "ascii", sizeof(typename));
|
|
|
|
type = TYPE_A;
|
1997-01-19 17:19:02 +03:00
|
|
|
curtype = TYPE_A;
|
1999-09-28 10:47:38 +04:00
|
|
|
(void)strlcpy(formname, "non-print", sizeof(formname));
|
|
|
|
form = FORM_N;
|
|
|
|
(void)strlcpy(modename, "stream", sizeof(modename));
|
|
|
|
mode = MODE_S;
|
|
|
|
(void)strlcpy(structname, "file", sizeof(structname));
|
|
|
|
stru = STRU_F;
|
|
|
|
(void)strlcpy(bytename, "8", sizeof(bytename));
|
|
|
|
bytesize = 8;
|
1997-01-19 17:19:02 +03:00
|
|
|
if (autologin)
|
1998-07-22 20:06:27 +04:00
|
|
|
(void)ftp_login(argv[1], NULL, NULL);
|
2000-06-15 17:08:23 +04:00
|
|
|
}
|
|
|
|
}
|
1997-01-19 17:19:02 +03:00
|
|
|
|
add support for FEAT and OPTS commands with `features' and `opts'.
(from RFC 2389).
add support for MLST & MLSD (machine parseble listings) with 'mlst', 'mlsd'
and 'pmlsd' (mlsd |$PAGER) commands. (from draft-ietf-ftpext-mlst-11)
rename remotesyst() to getremoteinfo(), and modify to parse the result from
FEAT (if supported), and take into account the support for the various
extensions such as MDTM, SIZE, REST (STREAM), MLSD, and FEAT/OPTS.
put each feature into one of the following categories:
- known to work (explicit FEAT)
- unknown but assume works until explicit failure, when it's
then tagged as `known not to work'.
- known not to work (FEAT succeeded but didn't return anything,
or was unknown and then explicit failure)
assign results into features[] matrix.
add support to getreply() so that an optional callback will be called
for each line received from the server except for the first and last.
this is used in FEAT (and MLST) parsing.
modify various commands to check if REST (STREAM), MDTM and SIZE are
explicitly or implicitly supported before using.
fix `syst' when verbose is off.
minor knf (indent goto labels by one space, etc).
simply various command usage handlers by assuming that argv != NULL except
for quit() and disconnect().
2000-07-18 11:16:52 +04:00
|
|
|
static void
|
|
|
|
parse_feat(const char *line)
|
|
|
|
{
|
|
|
|
|
|
|
|
if (strcasecmp(line, " MDTM") == 0)
|
|
|
|
features[FEAT_MDTM] = 1;
|
|
|
|
else if (strncasecmp(line, " MLST", sizeof(" MLST") - 1) == 0) {
|
|
|
|
features[FEAT_MLST] = 1;
|
|
|
|
} else if (strcasecmp(line, " REST STREAM") == 0)
|
|
|
|
features[FEAT_REST_STREAM] = 1;
|
|
|
|
else if (strcasecmp(line, " SIZE") == 0)
|
|
|
|
features[FEAT_SIZE] = 1;
|
|
|
|
else if (strcasecmp(line, " TVFS") == 0)
|
|
|
|
features[FEAT_TVFS] = 1;
|
|
|
|
}
|
|
|
|
|
2000-06-15 17:08:23 +04:00
|
|
|
/*
|
add support for FEAT and OPTS commands with `features' and `opts'.
(from RFC 2389).
add support for MLST & MLSD (machine parseble listings) with 'mlst', 'mlsd'
and 'pmlsd' (mlsd |$PAGER) commands. (from draft-ietf-ftpext-mlst-11)
rename remotesyst() to getremoteinfo(), and modify to parse the result from
FEAT (if supported), and take into account the support for the various
extensions such as MDTM, SIZE, REST (STREAM), MLSD, and FEAT/OPTS.
put each feature into one of the following categories:
- known to work (explicit FEAT)
- unknown but assume works until explicit failure, when it's
then tagged as `known not to work'.
- known not to work (FEAT succeeded but didn't return anything,
or was unknown and then explicit failure)
assign results into features[] matrix.
add support to getreply() so that an optional callback will be called
for each line received from the server except for the first and last.
this is used in FEAT (and MLST) parsing.
modify various commands to check if REST (STREAM), MDTM and SIZE are
explicitly or implicitly supported before using.
fix `syst' when verbose is off.
minor knf (indent goto labels by one space, etc).
simply various command usage handlers by assuming that argv != NULL except
for quit() and disconnect().
2000-07-18 11:16:52 +04:00
|
|
|
* Determine the remote system type (SYST) and features (FEAT).
|
2000-06-15 17:08:23 +04:00
|
|
|
* Call after a successful login (i.e, connected = -1)
|
|
|
|
*/
|
|
|
|
void
|
add support for FEAT and OPTS commands with `features' and `opts'.
(from RFC 2389).
add support for MLST & MLSD (machine parseble listings) with 'mlst', 'mlsd'
and 'pmlsd' (mlsd |$PAGER) commands. (from draft-ietf-ftpext-mlst-11)
rename remotesyst() to getremoteinfo(), and modify to parse the result from
FEAT (if supported), and take into account the support for the various
extensions such as MDTM, SIZE, REST (STREAM), MLSD, and FEAT/OPTS.
put each feature into one of the following categories:
- known to work (explicit FEAT)
- unknown but assume works until explicit failure, when it's
then tagged as `known not to work'.
- known not to work (FEAT succeeded but didn't return anything,
or was unknown and then explicit failure)
assign results into features[] matrix.
add support to getreply() so that an optional callback will be called
for each line received from the server except for the first and last.
this is used in FEAT (and MLST) parsing.
modify various commands to check if REST (STREAM), MDTM and SIZE are
explicitly or implicitly supported before using.
fix `syst' when verbose is off.
minor knf (indent goto labels by one space, etc).
simply various command usage handlers by assuming that argv != NULL except
for quit() and disconnect().
2000-07-18 11:16:52 +04:00
|
|
|
getremoteinfo(void)
|
2000-06-15 17:08:23 +04:00
|
|
|
{
|
add support for FEAT and OPTS commands with `features' and `opts'.
(from RFC 2389).
add support for MLST & MLSD (machine parseble listings) with 'mlst', 'mlsd'
and 'pmlsd' (mlsd |$PAGER) commands. (from draft-ietf-ftpext-mlst-11)
rename remotesyst() to getremoteinfo(), and modify to parse the result from
FEAT (if supported), and take into account the support for the various
extensions such as MDTM, SIZE, REST (STREAM), MLSD, and FEAT/OPTS.
put each feature into one of the following categories:
- known to work (explicit FEAT)
- unknown but assume works until explicit failure, when it's
then tagged as `known not to work'.
- known not to work (FEAT succeeded but didn't return anything,
or was unknown and then explicit failure)
assign results into features[] matrix.
add support to getreply() so that an optional callback will be called
for each line received from the server except for the first and last.
this is used in FEAT (and MLST) parsing.
modify various commands to check if REST (STREAM), MDTM and SIZE are
explicitly or implicitly supported before using.
fix `syst' when verbose is off.
minor knf (indent goto labels by one space, etc).
simply various command usage handlers by assuming that argv != NULL except
for quit() and disconnect().
2000-07-18 11:16:52 +04:00
|
|
|
int overbose, i;
|
2000-06-15 17:08:23 +04:00
|
|
|
|
|
|
|
overbose = verbose;
|
|
|
|
if (debug == 0)
|
|
|
|
verbose = -1;
|
|
|
|
|
add support for FEAT and OPTS commands with `features' and `opts'.
(from RFC 2389).
add support for MLST & MLSD (machine parseble listings) with 'mlst', 'mlsd'
and 'pmlsd' (mlsd |$PAGER) commands. (from draft-ietf-ftpext-mlst-11)
rename remotesyst() to getremoteinfo(), and modify to parse the result from
FEAT (if supported), and take into account the support for the various
extensions such as MDTM, SIZE, REST (STREAM), MLSD, and FEAT/OPTS.
put each feature into one of the following categories:
- known to work (explicit FEAT)
- unknown but assume works until explicit failure, when it's
then tagged as `known not to work'.
- known not to work (FEAT succeeded but didn't return anything,
or was unknown and then explicit failure)
assign results into features[] matrix.
add support to getreply() so that an optional callback will be called
for each line received from the server except for the first and last.
this is used in FEAT (and MLST) parsing.
modify various commands to check if REST (STREAM), MDTM and SIZE are
explicitly or implicitly supported before using.
fix `syst' when verbose is off.
minor knf (indent goto labels by one space, etc).
simply various command usage handlers by assuming that argv != NULL except
for quit() and disconnect().
2000-07-18 11:16:52 +04:00
|
|
|
/* determine remote system type */
|
|
|
|
if (command("SYST") == COMPLETE) {
|
|
|
|
if (overbose) {
|
|
|
|
char *cp, c;
|
|
|
|
|
|
|
|
c = 0;
|
|
|
|
cp = strchr(reply_string + 4, ' ');
|
|
|
|
if (cp == NULL)
|
|
|
|
cp = strchr(reply_string + 4, '\r');
|
|
|
|
if (cp) {
|
|
|
|
if (cp[-1] == '.')
|
|
|
|
cp--;
|
|
|
|
c = *cp;
|
|
|
|
*cp = '\0';
|
|
|
|
}
|
|
|
|
|
|
|
|
fprintf(ttyout, "Remote system type is %s.\n",
|
|
|
|
reply_string + 4);
|
|
|
|
if (cp)
|
|
|
|
*cp = c;
|
|
|
|
}
|
|
|
|
if (!strncmp(reply_string, "215 UNIX Type: L8", 17)) {
|
|
|
|
if (proxy)
|
|
|
|
unix_proxy = 1;
|
|
|
|
else
|
|
|
|
unix_server = 1;
|
|
|
|
/*
|
|
|
|
* Set type to 0 (not specified by user),
|
|
|
|
* meaning binary by default, but don't bother
|
|
|
|
* telling server. We can use binary
|
|
|
|
* for text files unless changed by the user.
|
|
|
|
*/
|
|
|
|
type = 0;
|
|
|
|
(void)strlcpy(typename, "binary", sizeof(typename));
|
|
|
|
if (overbose)
|
|
|
|
fprintf(ttyout,
|
|
|
|
"Using %s mode to transfer files.\n",
|
|
|
|
typename);
|
|
|
|
} else {
|
|
|
|
if (proxy)
|
|
|
|
unix_proxy = 0;
|
|
|
|
else
|
|
|
|
unix_server = 0;
|
|
|
|
if (overbose &&
|
|
|
|
!strncmp(reply_string, "215 TOPS20", 10))
|
|
|
|
fputs(
|
1998-06-04 12:28:35 +04:00
|
|
|
"Remember to set tenex mode when transferring binary files from this machine.\n",
|
add support for FEAT and OPTS commands with `features' and `opts'.
(from RFC 2389).
add support for MLST & MLSD (machine parseble listings) with 'mlst', 'mlsd'
and 'pmlsd' (mlsd |$PAGER) commands. (from draft-ietf-ftpext-mlst-11)
rename remotesyst() to getremoteinfo(), and modify to parse the result from
FEAT (if supported), and take into account the support for the various
extensions such as MDTM, SIZE, REST (STREAM), MLSD, and FEAT/OPTS.
put each feature into one of the following categories:
- known to work (explicit FEAT)
- unknown but assume works until explicit failure, when it's
then tagged as `known not to work'.
- known not to work (FEAT succeeded but didn't return anything,
or was unknown and then explicit failure)
assign results into features[] matrix.
add support to getreply() so that an optional callback will be called
for each line received from the server except for the first and last.
this is used in FEAT (and MLST) parsing.
modify various commands to check if REST (STREAM), MDTM and SIZE are
explicitly or implicitly supported before using.
fix `syst' when verbose is off.
minor knf (indent goto labels by one space, etc).
simply various command usage handlers by assuming that argv != NULL except
for quit() and disconnect().
2000-07-18 11:16:52 +04:00
|
|
|
ttyout);
|
|
|
|
}
|
1997-01-19 17:19:02 +03:00
|
|
|
}
|
add support for FEAT and OPTS commands with `features' and `opts'.
(from RFC 2389).
add support for MLST & MLSD (machine parseble listings) with 'mlst', 'mlsd'
and 'pmlsd' (mlsd |$PAGER) commands. (from draft-ietf-ftpext-mlst-11)
rename remotesyst() to getremoteinfo(), and modify to parse the result from
FEAT (if supported), and take into account the support for the various
extensions such as MDTM, SIZE, REST (STREAM), MLSD, and FEAT/OPTS.
put each feature into one of the following categories:
- known to work (explicit FEAT)
- unknown but assume works until explicit failure, when it's
then tagged as `known not to work'.
- known not to work (FEAT succeeded but didn't return anything,
or was unknown and then explicit failure)
assign results into features[] matrix.
add support to getreply() so that an optional callback will be called
for each line received from the server except for the first and last.
this is used in FEAT (and MLST) parsing.
modify various commands to check if REST (STREAM), MDTM and SIZE are
explicitly or implicitly supported before using.
fix `syst' when verbose is off.
minor knf (indent goto labels by one space, etc).
simply various command usage handlers by assuming that argv != NULL except
for quit() and disconnect().
2000-07-18 11:16:52 +04:00
|
|
|
|
|
|
|
/* determine features (if any) */
|
|
|
|
for (i = 0; i < FEAT_max; i++)
|
|
|
|
features[i] = -1;
|
|
|
|
reply_callback = parse_feat;
|
|
|
|
if (command("FEAT") == COMPLETE) {
|
|
|
|
for (i = 0; i < FEAT_max; i++) {
|
|
|
|
if (features[i] == -1)
|
|
|
|
features[i] = 0;
|
|
|
|
}
|
|
|
|
features[FEAT_FEAT] = 1;
|
|
|
|
} else
|
|
|
|
features[FEAT_FEAT] = 0;
|
|
|
|
if (debug)
|
|
|
|
for (i = 0; i < FEAT_max; i++)
|
|
|
|
printf("features[%d] = %d\n", i, features[i]);
|
|
|
|
reply_callback = NULL;
|
|
|
|
|
2000-06-15 17:08:23 +04:00
|
|
|
verbose = overbose;
|
1997-01-19 17:19:02 +03:00
|
|
|
}
|
|
|
|
|
1999-10-24 16:31:36 +04:00
|
|
|
/*
|
|
|
|
* Reset the various variables that indicate connection state back to
|
|
|
|
* disconnected settings.
|
|
|
|
* The caller is responsible for issuing any commands to the remote server
|
|
|
|
* to perform a clean shutdown before this is invoked.
|
|
|
|
*/
|
|
|
|
void
|
2000-06-15 17:08:23 +04:00
|
|
|
cleanuppeer(void)
|
1999-10-24 16:31:36 +04:00
|
|
|
{
|
|
|
|
|
|
|
|
if (cout)
|
|
|
|
(void)fclose(cout);
|
|
|
|
cout = NULL;
|
|
|
|
connected = 0;
|
2000-06-15 17:08:23 +04:00
|
|
|
unix_server = 0;
|
|
|
|
unix_proxy = 0;
|
1999-10-24 16:31:36 +04:00
|
|
|
/*
|
|
|
|
* determine if anonftp was specifically set with -a
|
|
|
|
* (1), or implicitly set by auto_fetch() (2). in the
|
|
|
|
* latter case, disable after the current xfer
|
|
|
|
*/
|
|
|
|
if (anonftp == 2)
|
|
|
|
anonftp = 0;
|
|
|
|
data = -1;
|
|
|
|
epsv4bad = 0;
|
1999-11-11 05:53:02 +03:00
|
|
|
if (username)
|
|
|
|
free(username);
|
1999-11-27 04:00:06 +03:00
|
|
|
username = NULL;
|
1999-10-24 16:31:36 +04:00
|
|
|
if (!proxy)
|
|
|
|
macnum = 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Top-level signal handler for interrupted commands.
|
|
|
|
*/
|
|
|
|
void
|
2000-05-01 14:35:16 +04:00
|
|
|
intr(int dummy)
|
1999-10-24 16:31:36 +04:00
|
|
|
{
|
|
|
|
|
|
|
|
alarmtimer(0);
|
|
|
|
if (fromatty)
|
|
|
|
write(fileno(ttyout), "\n", 1);
|
|
|
|
siglongjmp(toplevel, 1);
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Signal handler for lost connections; cleanup various elements of
|
|
|
|
* the connection state, and call cleanuppeer() to finish it off.
|
|
|
|
*/
|
|
|
|
void
|
2000-05-01 14:35:16 +04:00
|
|
|
lostpeer(int dummy)
|
1999-10-24 16:31:36 +04:00
|
|
|
{
|
|
|
|
int oerrno = errno;
|
|
|
|
|
|
|
|
alarmtimer(0);
|
|
|
|
if (connected) {
|
|
|
|
if (cout != NULL) {
|
|
|
|
(void)shutdown(fileno(cout), 1+1);
|
|
|
|
(void)fclose(cout);
|
|
|
|
cout = NULL;
|
|
|
|
}
|
|
|
|
if (data >= 0) {
|
|
|
|
(void)shutdown(data, 1+1);
|
|
|
|
(void)close(data);
|
|
|
|
data = -1;
|
|
|
|
}
|
|
|
|
connected = 0;
|
|
|
|
}
|
|
|
|
pswitch(1);
|
|
|
|
if (connected) {
|
|
|
|
if (cout != NULL) {
|
|
|
|
(void)shutdown(fileno(cout), 1+1);
|
|
|
|
(void)fclose(cout);
|
|
|
|
cout = NULL;
|
|
|
|
}
|
|
|
|
connected = 0;
|
|
|
|
}
|
|
|
|
proxflag = 0;
|
|
|
|
pswitch(0);
|
|
|
|
cleanuppeer();
|
|
|
|
errno = oerrno;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
1997-04-14 13:09:15 +04:00
|
|
|
/*
|
2000-06-15 17:08:23 +04:00
|
|
|
* Login to remote host, using given username & password if supplied.
|
|
|
|
* Return non-zero if successful.
|
1997-04-14 13:09:15 +04:00
|
|
|
*/
|
|
|
|
int
|
2000-05-01 14:35:16 +04:00
|
|
|
ftp_login(const char *host, const char *user, const char *pass)
|
1997-04-14 13:09:15 +04:00
|
|
|
{
|
|
|
|
char tmp[80];
|
1998-07-27 01:47:47 +04:00
|
|
|
const char *acct;
|
1999-10-24 16:31:36 +04:00
|
|
|
int n, aflag, rval, freeuser, freepass, freeacct;
|
1997-04-14 13:09:15 +04:00
|
|
|
|
|
|
|
acct = NULL;
|
1999-05-05 20:04:58 +04:00
|
|
|
aflag = rval = freeuser = freepass = freeacct = 0;
|
1997-04-14 13:09:15 +04:00
|
|
|
|
1999-11-27 00:41:55 +03:00
|
|
|
if (debug)
|
|
|
|
fprintf(ttyout, "ftp_login: user `%s' pass `%s' host `%s'\n",
|
|
|
|
user ? user : "<null>", pass ? pass : "<null>",
|
|
|
|
host ? host : "<null>");
|
|
|
|
|
|
|
|
|
1997-04-14 13:09:15 +04:00
|
|
|
/*
|
|
|
|
* Set up arguments for an anonymous FTP session, if necessary.
|
|
|
|
*/
|
1999-05-05 20:04:58 +04:00
|
|
|
if (anonftp) {
|
1997-06-11 01:59:58 +04:00
|
|
|
user = "anonymous"; /* as per RFC 1635 */
|
1999-10-24 16:31:36 +04:00
|
|
|
pass = getoptionvalue("anonpass");
|
1997-04-14 13:09:15 +04: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
|
|
|
if (user == NULL)
|
1999-05-05 20:04:58 +04:00
|
|
|
freeuser = 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
|
|
|
if (pass == NULL)
|
|
|
|
freepass = 1;
|
|
|
|
freeacct = 1;
|
|
|
|
if (ruserpass(host, &user, &pass, &acct) < 0) {
|
|
|
|
code = -1;
|
|
|
|
goto cleanup_ftp_login;
|
1999-05-05 20:04:58 +04:00
|
|
|
}
|
|
|
|
|
1997-04-14 13:09:15 +04:00
|
|
|
while (user == NULL) {
|
2000-11-15 03:10:59 +03:00
|
|
|
if (localname)
|
|
|
|
fprintf(ttyout, "Name (%s:%s): ", host, localname);
|
1997-04-14 13:09:15 +04:00
|
|
|
else
|
1998-06-04 12:28:35 +04:00
|
|
|
fprintf(ttyout, "Name (%s): ", host);
|
1998-01-18 17:23:33 +03:00
|
|
|
*tmp = '\0';
|
1999-06-02 06:03:57 +04:00
|
|
|
if (fgets(tmp, sizeof(tmp) - 1, stdin) == NULL) {
|
|
|
|
fprintf(ttyout, "\nEOF received; login aborted.\n");
|
1999-10-12 10:04:59 +04:00
|
|
|
clearerr(stdin);
|
1999-06-02 06:03:57 +04:00
|
|
|
code = -1;
|
|
|
|
goto cleanup_ftp_login;
|
|
|
|
}
|
1997-04-14 13:09:15 +04:00
|
|
|
tmp[strlen(tmp) - 1] = '\0';
|
1999-06-25 03:21:02 +04:00
|
|
|
freeuser = 0;
|
1997-04-14 13:09:15 +04:00
|
|
|
if (*tmp == '\0')
|
2000-11-15 03:10:59 +03:00
|
|
|
user = localname;
|
1997-04-14 13:09:15 +04:00
|
|
|
else
|
|
|
|
user = tmp;
|
|
|
|
}
|
1999-06-02 06:03:57 +04:00
|
|
|
|
|
|
|
if (gatemode) {
|
|
|
|
char *nuser;
|
|
|
|
int len;
|
|
|
|
|
|
|
|
len = strlen(user) + 1 + strlen(host) + 1;
|
|
|
|
nuser = xmalloc(len);
|
1999-09-28 10:47:38 +04:00
|
|
|
(void)strlcpy(nuser, user, len);
|
|
|
|
(void)strlcat(nuser, "@", len);
|
|
|
|
(void)strlcat(nuser, host, len);
|
1999-06-02 06:03:57 +04:00
|
|
|
freeuser = 1;
|
1999-06-25 03:21:02 +04:00
|
|
|
user = nuser;
|
1999-06-02 06:03:57 +04:00
|
|
|
}
|
|
|
|
|
1997-04-14 13:09:15 +04:00
|
|
|
n = command("USER %s", user);
|
|
|
|
if (n == CONTINUE) {
|
1999-06-25 03:21:02 +04:00
|
|
|
if (pass == NULL) {
|
|
|
|
freepass = 0;
|
1997-04-14 13:09:15 +04:00
|
|
|
pass = getpass("Password:");
|
1999-06-25 03:21:02 +04:00
|
|
|
}
|
1997-04-14 13:09:15 +04:00
|
|
|
n = command("PASS %s", pass);
|
|
|
|
}
|
|
|
|
if (n == CONTINUE) {
|
|
|
|
aflag++;
|
1999-05-05 20:04:58 +04:00
|
|
|
if (acct == NULL) {
|
|
|
|
freeacct = 0;
|
1999-06-25 03:21:02 +04:00
|
|
|
acct = getpass("Account:");
|
1999-05-05 20:04:58 +04:00
|
|
|
}
|
1999-06-02 06:03:57 +04:00
|
|
|
if (acct[0] == '\0') {
|
|
|
|
warnx("Login failed.");
|
|
|
|
goto cleanup_ftp_login;
|
|
|
|
}
|
1997-04-14 13:09:15 +04:00
|
|
|
n = command("ACCT %s", acct);
|
|
|
|
}
|
|
|
|
if ((n != COMPLETE) ||
|
|
|
|
(!aflag && acct != NULL && command("ACCT %s", acct) != COMPLETE)) {
|
|
|
|
warnx("Login failed.");
|
1999-05-05 20:04:58 +04:00
|
|
|
goto cleanup_ftp_login;
|
|
|
|
}
|
1999-05-20 18:08:12 +04:00
|
|
|
rval = 1;
|
1999-11-11 05:53:02 +03:00
|
|
|
username = xstrdup(user);
|
1999-05-20 18:08:12 +04:00
|
|
|
if (proxy)
|
1999-05-05 20:04:58 +04:00
|
|
|
goto cleanup_ftp_login;
|
1999-05-20 18:08:12 +04:00
|
|
|
|
1997-04-14 13:09:15 +04:00
|
|
|
connected = -1;
|
add support for FEAT and OPTS commands with `features' and `opts'.
(from RFC 2389).
add support for MLST & MLSD (machine parseble listings) with 'mlst', 'mlsd'
and 'pmlsd' (mlsd |$PAGER) commands. (from draft-ietf-ftpext-mlst-11)
rename remotesyst() to getremoteinfo(), and modify to parse the result from
FEAT (if supported), and take into account the support for the various
extensions such as MDTM, SIZE, REST (STREAM), MLSD, and FEAT/OPTS.
put each feature into one of the following categories:
- known to work (explicit FEAT)
- unknown but assume works until explicit failure, when it's
then tagged as `known not to work'.
- known not to work (FEAT succeeded but didn't return anything,
or was unknown and then explicit failure)
assign results into features[] matrix.
add support to getreply() so that an optional callback will be called
for each line received from the server except for the first and last.
this is used in FEAT (and MLST) parsing.
modify various commands to check if REST (STREAM), MDTM and SIZE are
explicitly or implicitly supported before using.
fix `syst' when verbose is off.
minor knf (indent goto labels by one space, etc).
simply various command usage handlers by assuming that argv != NULL except
for quit() and disconnect().
2000-07-18 11:16:52 +04:00
|
|
|
getremoteinfo();
|
1997-04-14 13:09:15 +04:00
|
|
|
for (n = 0; n < macnum; ++n) {
|
|
|
|
if (!strcmp("init", macros[n].mac_name)) {
|
1999-09-28 10:47:38 +04:00
|
|
|
(void)strlcpy(line, "$init", sizeof(line));
|
1997-04-14 13:09:15 +04:00
|
|
|
makeargv();
|
|
|
|
domacro(margc, margv);
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
1999-11-27 00:41:55 +03:00
|
|
|
updateremotepwd();
|
|
|
|
|
add support for FEAT and OPTS commands with `features' and `opts'.
(from RFC 2389).
add support for MLST & MLSD (machine parseble listings) with 'mlst', 'mlsd'
and 'pmlsd' (mlsd |$PAGER) commands. (from draft-ietf-ftpext-mlst-11)
rename remotesyst() to getremoteinfo(), and modify to parse the result from
FEAT (if supported), and take into account the support for the various
extensions such as MDTM, SIZE, REST (STREAM), MLSD, and FEAT/OPTS.
put each feature into one of the following categories:
- known to work (explicit FEAT)
- unknown but assume works until explicit failure, when it's
then tagged as `known not to work'.
- known not to work (FEAT succeeded but didn't return anything,
or was unknown and then explicit failure)
assign results into features[] matrix.
add support to getreply() so that an optional callback will be called
for each line received from the server except for the first and last.
this is used in FEAT (and MLST) parsing.
modify various commands to check if REST (STREAM), MDTM and SIZE are
explicitly or implicitly supported before using.
fix `syst' when verbose is off.
minor knf (indent goto labels by one space, etc).
simply various command usage handlers by assuming that argv != NULL except
for quit() and disconnect().
2000-07-18 11:16:52 +04:00
|
|
|
cleanup_ftp_login:
|
1999-05-05 20:04:58 +04:00
|
|
|
if (user != NULL && freeuser)
|
|
|
|
free((char *)user);
|
|
|
|
if (pass != NULL && freepass)
|
|
|
|
free((char *)pass);
|
|
|
|
if (acct != NULL && freeacct)
|
|
|
|
free((char *)acct);
|
|
|
|
return (rval);
|
1997-04-14 13:09:15 +04:00
|
|
|
}
|
|
|
|
|
1997-01-19 17:19:02 +03:00
|
|
|
/*
|
1997-03-13 09:23:11 +03:00
|
|
|
* `another' gets another argument, and stores the new argc and argv.
|
1999-10-24 16:31:36 +04:00
|
|
|
* It reverts to the top level (via intr()) on EOF/error.
|
1997-01-19 17:19:02 +03:00
|
|
|
*
|
|
|
|
* Returns false if no new arguments have been added.
|
|
|
|
*/
|
|
|
|
int
|
2000-05-01 14:35:16 +04:00
|
|
|
another(int *pargc, char ***pargv, const char *prompt)
|
1997-01-19 17:19:02 +03:00
|
|
|
{
|
|
|
|
int len = strlen(line), ret;
|
|
|
|
|
|
|
|
if (len >= sizeof(line) - 3) {
|
1998-06-04 12:28:35 +04:00
|
|
|
fputs("sorry, arguments too long.\n", ttyout);
|
1999-10-09 07:00:55 +04:00
|
|
|
intr(0);
|
1997-01-19 17:19:02 +03:00
|
|
|
}
|
1998-06-04 12:28:35 +04:00
|
|
|
fprintf(ttyout, "(%s) ", prompt);
|
1997-01-19 17:19:02 +03:00
|
|
|
line[len++] = ' ';
|
1999-10-12 10:04:59 +04:00
|
|
|
if (fgets(&line[len], sizeof(line) - len, stdin) == NULL) {
|
|
|
|
clearerr(stdin);
|
1999-10-09 07:00:55 +04:00
|
|
|
intr(0);
|
1999-10-12 10:04:59 +04:00
|
|
|
}
|
1997-01-19 17:19:02 +03:00
|
|
|
len += strlen(&line[len]);
|
|
|
|
if (len > 0 && line[len - 1] == '\n')
|
|
|
|
line[len - 1] = '\0';
|
|
|
|
makeargv();
|
|
|
|
ret = margc > *pargc;
|
|
|
|
*pargc = margc;
|
|
|
|
*pargv = margv;
|
|
|
|
return (ret);
|
|
|
|
}
|
|
|
|
|
1997-03-13 09:23:11 +03:00
|
|
|
/*
|
|
|
|
* glob files given in argv[] from the remote server.
|
|
|
|
* if errbuf isn't NULL, store error messages there instead
|
|
|
|
* of writing to the screen.
|
|
|
|
*/
|
1997-01-19 17:19:02 +03:00
|
|
|
char *
|
2000-05-01 14:35:16 +04:00
|
|
|
remglob(char *argv[], int doswitch, char **errbuf)
|
1997-01-19 17:19:02 +03:00
|
|
|
{
|
|
|
|
char temp[MAXPATHLEN];
|
|
|
|
static char buf[MAXPATHLEN];
|
|
|
|
static FILE *ftemp = NULL;
|
|
|
|
static char **args;
|
2001-02-19 23:02:42 +03:00
|
|
|
int oldverbose, oldhash, oldprogress, fd, len;
|
1997-01-19 17:19:02 +03:00
|
|
|
char *cp, *mode;
|
|
|
|
|
1999-10-24 16:31:36 +04:00
|
|
|
if (!mflag || !connected) {
|
1997-03-13 09:23:11 +03:00
|
|
|
if (!doglob)
|
1997-01-19 17:19:02 +03:00
|
|
|
args = NULL;
|
|
|
|
else {
|
|
|
|
if (ftemp) {
|
1997-03-13 09:23:11 +03:00
|
|
|
(void)fclose(ftemp);
|
1997-01-19 17:19:02 +03:00
|
|
|
ftemp = NULL;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return (NULL);
|
|
|
|
}
|
|
|
|
if (!doglob) {
|
|
|
|
if (args == NULL)
|
|
|
|
args = argv;
|
|
|
|
if ((cp = *++args) == NULL)
|
|
|
|
args = NULL;
|
|
|
|
return (cp);
|
|
|
|
}
|
|
|
|
if (ftemp == NULL) {
|
1999-10-09 07:00:55 +04:00
|
|
|
len = strlcpy(temp, tmpdir, sizeof(temp));
|
|
|
|
if (temp[len - 1] != '/')
|
1999-10-07 06:05:22 +04:00
|
|
|
(void)strlcat(temp, "/", sizeof(temp));
|
|
|
|
(void)strlcat(temp, TMPFILE, sizeof(temp));
|
1997-03-13 09:23:11 +03:00
|
|
|
if ((fd = mkstemp(temp)) < 0) {
|
1997-01-19 17:19:02 +03:00
|
|
|
warn("unable to create temporary file %s", temp);
|
|
|
|
return (NULL);
|
|
|
|
}
|
|
|
|
close(fd);
|
1997-03-13 09:23:11 +03:00
|
|
|
oldverbose = verbose;
|
|
|
|
verbose = (errbuf != NULL) ? -1 : 0;
|
|
|
|
oldhash = hash;
|
2001-02-19 23:02:42 +03:00
|
|
|
oldprogress = progress;
|
1997-03-13 09:23:11 +03:00
|
|
|
hash = 0;
|
2001-02-19 23:02:42 +03:00
|
|
|
progress = 0;
|
1997-03-13 09:23:11 +03:00
|
|
|
if (doswitch)
|
1997-01-19 17:19:02 +03:00
|
|
|
pswitch(!proxy);
|
|
|
|
for (mode = "w"; *++argv != NULL; mode = "a")
|
1997-08-18 14:20:13 +04:00
|
|
|
recvrequest("NLST", temp, *argv, mode, 0, 0);
|
1997-03-13 09:23:11 +03:00
|
|
|
if ((code / 100) != COMPLETE) {
|
|
|
|
if (errbuf != NULL)
|
|
|
|
*errbuf = reply_string;
|
|
|
|
}
|
|
|
|
if (doswitch)
|
1997-01-19 17:19:02 +03:00
|
|
|
pswitch(!proxy);
|
1997-03-13 09:23:11 +03:00
|
|
|
verbose = oldverbose;
|
|
|
|
hash = oldhash;
|
2001-02-19 23:02:42 +03:00
|
|
|
progress = oldprogress;
|
1997-01-19 17:19:02 +03:00
|
|
|
ftemp = fopen(temp, "r");
|
1997-03-13 09:23:11 +03:00
|
|
|
(void)unlink(temp);
|
1997-01-19 17:19:02 +03:00
|
|
|
if (ftemp == NULL) {
|
1997-03-13 09:23:11 +03:00
|
|
|
if (errbuf == NULL)
|
1998-06-04 12:28:35 +04:00
|
|
|
fputs(
|
|
|
|
"can't find list of remote files, oops.\n",
|
|
|
|
ttyout);
|
1997-03-13 09:23:11 +03:00
|
|
|
else
|
|
|
|
*errbuf =
|
|
|
|
"can't find list of remote files, oops.";
|
1997-01-19 17:19:02 +03:00
|
|
|
return (NULL);
|
|
|
|
}
|
|
|
|
}
|
1997-03-13 09:23:11 +03:00
|
|
|
if (fgets(buf, sizeof(buf), ftemp) == NULL) {
|
|
|
|
(void)fclose(ftemp);
|
|
|
|
ftemp = NULL;
|
1997-01-19 17:19:02 +03:00
|
|
|
return (NULL);
|
|
|
|
}
|
|
|
|
if ((cp = strchr(buf, '\n')) != NULL)
|
|
|
|
*cp = '\0';
|
|
|
|
return (buf);
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
1999-09-28 10:47:38 +04:00
|
|
|
* Glob a local file name specification with the expectation of a single
|
|
|
|
* return value. Can't control multiple values being expanded from the
|
|
|
|
* expression, we return only the first.
|
|
|
|
* Returns NULL on error, or a pointer to a buffer containing the filename
|
|
|
|
* that's the caller's responsiblity to free(3) when finished with.
|
1997-01-19 17:19:02 +03:00
|
|
|
*/
|
1999-09-28 10:47:38 +04:00
|
|
|
char *
|
2000-05-01 14:35:16 +04:00
|
|
|
globulize(const char *pattern)
|
1997-01-19 17:19:02 +03:00
|
|
|
{
|
|
|
|
glob_t gl;
|
|
|
|
int flags;
|
1999-09-28 10:47:38 +04:00
|
|
|
char *p;
|
1997-01-19 17:19:02 +03:00
|
|
|
|
|
|
|
if (!doglob)
|
1999-09-28 10:47:38 +04:00
|
|
|
return (xstrdup(pattern));
|
1997-01-19 17:19:02 +03:00
|
|
|
|
1998-06-20 02:58:04 +04:00
|
|
|
flags = GLOB_BRACE|GLOB_NOCHECK|GLOB_TILDE;
|
1997-01-19 17:19:02 +03:00
|
|
|
memset(&gl, 0, sizeof(gl));
|
1999-09-28 10:47:38 +04:00
|
|
|
if (glob(pattern, flags, NULL, &gl) || gl.gl_pathc == 0) {
|
|
|
|
warnx("%s: not found", pattern);
|
1997-01-19 17:19:02 +03:00
|
|
|
globfree(&gl);
|
1999-09-28 10:47:38 +04:00
|
|
|
return (NULL);
|
1997-01-19 17:19:02 +03:00
|
|
|
}
|
1999-09-28 10:47:38 +04:00
|
|
|
p = xstrdup(gl.gl_pathv[0]);
|
1997-01-19 17:19:02 +03:00
|
|
|
globfree(&gl);
|
1999-09-28 10:47:38 +04:00
|
|
|
return (p);
|
1997-01-19 17:19:02 +03:00
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* determine size of remote file
|
|
|
|
*/
|
|
|
|
off_t
|
2000-05-01 14:35:16 +04:00
|
|
|
remotesize(const char *file, int noisy)
|
1997-01-19 17:19:02 +03:00
|
|
|
{
|
add support for FEAT and OPTS commands with `features' and `opts'.
(from RFC 2389).
add support for MLST & MLSD (machine parseble listings) with 'mlst', 'mlsd'
and 'pmlsd' (mlsd |$PAGER) commands. (from draft-ietf-ftpext-mlst-11)
rename remotesyst() to getremoteinfo(), and modify to parse the result from
FEAT (if supported), and take into account the support for the various
extensions such as MDTM, SIZE, REST (STREAM), MLSD, and FEAT/OPTS.
put each feature into one of the following categories:
- known to work (explicit FEAT)
- unknown but assume works until explicit failure, when it's
then tagged as `known not to work'.
- known not to work (FEAT succeeded but didn't return anything,
or was unknown and then explicit failure)
assign results into features[] matrix.
add support to getreply() so that an optional callback will be called
for each line received from the server except for the first and last.
this is used in FEAT (and MLST) parsing.
modify various commands to check if REST (STREAM), MDTM and SIZE are
explicitly or implicitly supported before using.
fix `syst' when verbose is off.
minor knf (indent goto labels by one space, etc).
simply various command usage handlers by assuming that argv != NULL except
for quit() and disconnect().
2000-07-18 11:16:52 +04:00
|
|
|
int overbose, r;
|
1997-01-19 17:19:02 +03:00
|
|
|
off_t size;
|
|
|
|
|
|
|
|
overbose = verbose;
|
|
|
|
size = -1;
|
|
|
|
if (debug == 0)
|
|
|
|
verbose = -1;
|
add support for FEAT and OPTS commands with `features' and `opts'.
(from RFC 2389).
add support for MLST & MLSD (machine parseble listings) with 'mlst', 'mlsd'
and 'pmlsd' (mlsd |$PAGER) commands. (from draft-ietf-ftpext-mlst-11)
rename remotesyst() to getremoteinfo(), and modify to parse the result from
FEAT (if supported), and take into account the support for the various
extensions such as MDTM, SIZE, REST (STREAM), MLSD, and FEAT/OPTS.
put each feature into one of the following categories:
- known to work (explicit FEAT)
- unknown but assume works until explicit failure, when it's
then tagged as `known not to work'.
- known not to work (FEAT succeeded but didn't return anything,
or was unknown and then explicit failure)
assign results into features[] matrix.
add support to getreply() so that an optional callback will be called
for each line received from the server except for the first and last.
this is used in FEAT (and MLST) parsing.
modify various commands to check if REST (STREAM), MDTM and SIZE are
explicitly or implicitly supported before using.
fix `syst' when verbose is off.
minor knf (indent goto labels by one space, etc).
simply various command usage handlers by assuming that argv != NULL except
for quit() and disconnect().
2000-07-18 11:16:52 +04:00
|
|
|
if (! features[FEAT_SIZE]) {
|
|
|
|
if (noisy)
|
|
|
|
fprintf(ttyout,
|
|
|
|
"SIZE is not supported by remote server.\n");
|
|
|
|
goto cleanup_remotesize;
|
|
|
|
}
|
|
|
|
r = command("SIZE %s", file);
|
|
|
|
if (r == COMPLETE) {
|
1997-07-21 18:03:48 +04:00
|
|
|
char *cp, *ep;
|
|
|
|
|
|
|
|
cp = strchr(reply_string, ' ');
|
|
|
|
if (cp != NULL) {
|
|
|
|
cp++;
|
2000-07-30 08:42:37 +04:00
|
|
|
size = STRTOLL(cp, &ep, 10);
|
1998-05-20 04:55:52 +04:00
|
|
|
if (*ep != '\0' && !isspace((unsigned char)*ep))
|
1997-07-21 18:03:48 +04:00
|
|
|
size = -1;
|
|
|
|
}
|
add support for FEAT and OPTS commands with `features' and `opts'.
(from RFC 2389).
add support for MLST & MLSD (machine parseble listings) with 'mlst', 'mlsd'
and 'pmlsd' (mlsd |$PAGER) commands. (from draft-ietf-ftpext-mlst-11)
rename remotesyst() to getremoteinfo(), and modify to parse the result from
FEAT (if supported), and take into account the support for the various
extensions such as MDTM, SIZE, REST (STREAM), MLSD, and FEAT/OPTS.
put each feature into one of the following categories:
- known to work (explicit FEAT)
- unknown but assume works until explicit failure, when it's
then tagged as `known not to work'.
- known not to work (FEAT succeeded but didn't return anything,
or was unknown and then explicit failure)
assign results into features[] matrix.
add support to getreply() so that an optional callback will be called
for each line received from the server except for the first and last.
this is used in FEAT (and MLST) parsing.
modify various commands to check if REST (STREAM), MDTM and SIZE are
explicitly or implicitly supported before using.
fix `syst' when verbose is off.
minor knf (indent goto labels by one space, etc).
simply various command usage handlers by assuming that argv != NULL except
for quit() and disconnect().
2000-07-18 11:16:52 +04:00
|
|
|
} else {
|
|
|
|
if (r == ERROR && code == 500 && features[FEAT_SIZE] == -1)
|
|
|
|
features[FEAT_SIZE] = 0;
|
|
|
|
if (noisy && debug == 0) {
|
|
|
|
fputs(reply_string, ttyout);
|
|
|
|
putc('\n', ttyout);
|
|
|
|
}
|
1998-06-04 12:28:35 +04:00
|
|
|
}
|
add support for FEAT and OPTS commands with `features' and `opts'.
(from RFC 2389).
add support for MLST & MLSD (machine parseble listings) with 'mlst', 'mlsd'
and 'pmlsd' (mlsd |$PAGER) commands. (from draft-ietf-ftpext-mlst-11)
rename remotesyst() to getremoteinfo(), and modify to parse the result from
FEAT (if supported), and take into account the support for the various
extensions such as MDTM, SIZE, REST (STREAM), MLSD, and FEAT/OPTS.
put each feature into one of the following categories:
- known to work (explicit FEAT)
- unknown but assume works until explicit failure, when it's
then tagged as `known not to work'.
- known not to work (FEAT succeeded but didn't return anything,
or was unknown and then explicit failure)
assign results into features[] matrix.
add support to getreply() so that an optional callback will be called
for each line received from the server except for the first and last.
this is used in FEAT (and MLST) parsing.
modify various commands to check if REST (STREAM), MDTM and SIZE are
explicitly or implicitly supported before using.
fix `syst' when verbose is off.
minor knf (indent goto labels by one space, etc).
simply various command usage handlers by assuming that argv != NULL except
for quit() and disconnect().
2000-07-18 11:16:52 +04:00
|
|
|
cleanup_remotesize:
|
1997-01-19 17:19:02 +03:00
|
|
|
verbose = overbose;
|
|
|
|
return (size);
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* determine last modification time (in GMT) of remote file
|
|
|
|
*/
|
|
|
|
time_t
|
2000-05-01 14:35:16 +04:00
|
|
|
remotemodtime(const char *file, int noisy)
|
1997-01-19 17:19:02 +03:00
|
|
|
{
|
add support for FEAT and OPTS commands with `features' and `opts'.
(from RFC 2389).
add support for MLST & MLSD (machine parseble listings) with 'mlst', 'mlsd'
and 'pmlsd' (mlsd |$PAGER) commands. (from draft-ietf-ftpext-mlst-11)
rename remotesyst() to getremoteinfo(), and modify to parse the result from
FEAT (if supported), and take into account the support for the various
extensions such as MDTM, SIZE, REST (STREAM), MLSD, and FEAT/OPTS.
put each feature into one of the following categories:
- known to work (explicit FEAT)
- unknown but assume works until explicit failure, when it's
then tagged as `known not to work'.
- known not to work (FEAT succeeded but didn't return anything,
or was unknown and then explicit failure)
assign results into features[] matrix.
add support to getreply() so that an optional callback will be called
for each line received from the server except for the first and last.
this is used in FEAT (and MLST) parsing.
modify various commands to check if REST (STREAM), MDTM and SIZE are
explicitly or implicitly supported before using.
fix `syst' when verbose is off.
minor knf (indent goto labels by one space, etc).
simply various command usage handlers by assuming that argv != NULL except
for quit() and disconnect().
2000-07-18 11:16:52 +04:00
|
|
|
int overbose, ocode, r;
|
|
|
|
time_t rtime;
|
1997-01-19 17:19:02 +03:00
|
|
|
|
|
|
|
overbose = verbose;
|
1997-09-21 05:06:30 +04:00
|
|
|
ocode = code;
|
1997-01-19 17:19:02 +03:00
|
|
|
rtime = -1;
|
|
|
|
if (debug == 0)
|
|
|
|
verbose = -1;
|
add support for FEAT and OPTS commands with `features' and `opts'.
(from RFC 2389).
add support for MLST & MLSD (machine parseble listings) with 'mlst', 'mlsd'
and 'pmlsd' (mlsd |$PAGER) commands. (from draft-ietf-ftpext-mlst-11)
rename remotesyst() to getremoteinfo(), and modify to parse the result from
FEAT (if supported), and take into account the support for the various
extensions such as MDTM, SIZE, REST (STREAM), MLSD, and FEAT/OPTS.
put each feature into one of the following categories:
- known to work (explicit FEAT)
- unknown but assume works until explicit failure, when it's
then tagged as `known not to work'.
- known not to work (FEAT succeeded but didn't return anything,
or was unknown and then explicit failure)
assign results into features[] matrix.
add support to getreply() so that an optional callback will be called
for each line received from the server except for the first and last.
this is used in FEAT (and MLST) parsing.
modify various commands to check if REST (STREAM), MDTM and SIZE are
explicitly or implicitly supported before using.
fix `syst' when verbose is off.
minor knf (indent goto labels by one space, etc).
simply various command usage handlers by assuming that argv != NULL except
for quit() and disconnect().
2000-07-18 11:16:52 +04:00
|
|
|
if (! features[FEAT_MDTM]) {
|
|
|
|
if (noisy)
|
|
|
|
fprintf(ttyout,
|
|
|
|
"MDTM is not supported by remote server.\n");
|
|
|
|
goto cleanup_parse_time;
|
|
|
|
}
|
|
|
|
r = command("MDTM %s", file);
|
|
|
|
if (r == COMPLETE) {
|
1997-01-19 17:19:02 +03:00
|
|
|
struct tm timebuf;
|
2000-01-25 09:11:00 +03:00
|
|
|
char *timestr, *frac;
|
2000-01-26 14:31:55 +03:00
|
|
|
int yy, mo, day, hour, min, sec;
|
2000-01-25 09:11:00 +03:00
|
|
|
|
|
|
|
/*
|
|
|
|
* time-val = 14DIGIT [ "." 1*DIGIT ]
|
|
|
|
* YYYYMMDDHHMMSS[.sss]
|
|
|
|
* mdtm-response = "213" SP time-val CRLF / error-response
|
|
|
|
*/
|
|
|
|
timestr = reply_string + 4;
|
|
|
|
|
|
|
|
/*
|
|
|
|
* parse fraction.
|
|
|
|
* XXX: ignored for now
|
|
|
|
*/
|
|
|
|
frac = strchr(timestr, '\r');
|
|
|
|
if (frac != NULL)
|
|
|
|
*frac = '\0';
|
|
|
|
frac = strchr(timestr, '.');
|
|
|
|
if (frac != NULL)
|
|
|
|
*frac++ = '\0';
|
|
|
|
if (strlen(timestr) == 15 && strncmp(timestr, "191", 3) == 0) {
|
|
|
|
/*
|
2000-01-25 09:45:18 +03:00
|
|
|
* XXX: Workaround for lame ftpd's that return
|
|
|
|
* `19100' instead of `2000'
|
2000-01-25 09:11:00 +03:00
|
|
|
*/
|
|
|
|
fprintf(ttyout,
|
|
|
|
"Y2K warning! Incorrect time-val `%s' received from server.\n",
|
|
|
|
timestr);
|
|
|
|
timestr++;
|
|
|
|
timestr[0] = '2';
|
|
|
|
timestr[1] = '0';
|
|
|
|
fprintf(ttyout, "Converted to `%s'\n", timestr);
|
|
|
|
}
|
|
|
|
if (strlen(timestr) != 14 ||
|
2000-01-26 14:31:55 +03:00
|
|
|
sscanf(timestr, "%04d%02d%02d%02d%02d%02d",
|
|
|
|
&yy, &mo, &day, &hour, &min, &sec) != 6) {
|
2000-01-25 09:11:00 +03:00
|
|
|
bad_parse_time:
|
2000-01-26 14:31:55 +03:00
|
|
|
fprintf(ttyout, "Can't parse time `%s'.\n", timestr);
|
2000-01-25 09:11:00 +03:00
|
|
|
goto cleanup_parse_time;
|
|
|
|
}
|
2000-01-26 14:31:55 +03:00
|
|
|
memset(&timebuf, 0, sizeof(timebuf));
|
|
|
|
timebuf.tm_sec = sec;
|
|
|
|
timebuf.tm_min = min;
|
|
|
|
timebuf.tm_hour = hour;
|
|
|
|
timebuf.tm_mday = day;
|
|
|
|
timebuf.tm_mon = mo - 1;
|
|
|
|
timebuf.tm_year = yy - TM_YEAR_BASE;
|
|
|
|
timebuf.tm_isdst = -1;
|
1999-09-26 06:00:12 +04:00
|
|
|
rtime = timegm(&timebuf);
|
2000-01-26 13:15:40 +03:00
|
|
|
if (rtime == -1) {
|
|
|
|
if (noisy || debug != 0)
|
|
|
|
goto bad_parse_time;
|
|
|
|
else
|
|
|
|
goto cleanup_parse_time;
|
|
|
|
} else if (debug)
|
|
|
|
fprintf(ttyout, "parsed date as: %s", ctime(&rtime));
|
add support for FEAT and OPTS commands with `features' and `opts'.
(from RFC 2389).
add support for MLST & MLSD (machine parseble listings) with 'mlst', 'mlsd'
and 'pmlsd' (mlsd |$PAGER) commands. (from draft-ietf-ftpext-mlst-11)
rename remotesyst() to getremoteinfo(), and modify to parse the result from
FEAT (if supported), and take into account the support for the various
extensions such as MDTM, SIZE, REST (STREAM), MLSD, and FEAT/OPTS.
put each feature into one of the following categories:
- known to work (explicit FEAT)
- unknown but assume works until explicit failure, when it's
then tagged as `known not to work'.
- known not to work (FEAT succeeded but didn't return anything,
or was unknown and then explicit failure)
assign results into features[] matrix.
add support to getreply() so that an optional callback will be called
for each line received from the server except for the first and last.
this is used in FEAT (and MLST) parsing.
modify various commands to check if REST (STREAM), MDTM and SIZE are
explicitly or implicitly supported before using.
fix `syst' when verbose is off.
minor knf (indent goto labels by one space, etc).
simply various command usage handlers by assuming that argv != NULL except
for quit() and disconnect().
2000-07-18 11:16:52 +04:00
|
|
|
} else {
|
|
|
|
if (r == ERROR && code == 500 && features[FEAT_MDTM] == -1)
|
|
|
|
features[FEAT_MDTM] = 0;
|
|
|
|
if (noisy && debug == 0) {
|
|
|
|
fputs(reply_string, ttyout);
|
|
|
|
putc('\n', ttyout);
|
|
|
|
}
|
1998-06-04 12:28:35 +04:00
|
|
|
}
|
2000-01-25 09:11:00 +03:00
|
|
|
cleanup_parse_time:
|
1997-01-19 17:19:02 +03:00
|
|
|
verbose = overbose;
|
1997-09-21 05:06:30 +04:00
|
|
|
if (rtime == -1)
|
|
|
|
code = ocode;
|
1997-01-19 17:19:02 +03:00
|
|
|
return (rtime);
|
|
|
|
}
|
|
|
|
|
1999-11-11 05:53:02 +03:00
|
|
|
/*
|
|
|
|
* update global `remotepwd', which contains the state of the remote cwd
|
|
|
|
*/
|
|
|
|
void
|
2000-05-01 14:35:16 +04:00
|
|
|
updateremotepwd(void)
|
1999-11-11 05:53:02 +03:00
|
|
|
{
|
|
|
|
int overbose, ocode, i;
|
|
|
|
char *cp;
|
|
|
|
|
|
|
|
overbose = verbose;
|
|
|
|
ocode = code;
|
|
|
|
if (debug == 0)
|
|
|
|
verbose = -1;
|
|
|
|
if (command("PWD") != COMPLETE)
|
|
|
|
goto badremotepwd;
|
|
|
|
cp = strchr(reply_string, ' ');
|
|
|
|
if (cp == NULL || cp[0] == '\0' || cp[1] != '"')
|
|
|
|
goto badremotepwd;
|
|
|
|
cp += 2;
|
|
|
|
for (i = 0; *cp && i < sizeof(remotepwd) - 1; i++, cp++) {
|
|
|
|
if (cp[0] == '"') {
|
|
|
|
if (cp[1] == '"')
|
|
|
|
cp++;
|
|
|
|
else
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
remotepwd[i] = *cp;
|
|
|
|
}
|
|
|
|
remotepwd[i] = '\0';
|
|
|
|
if (debug)
|
|
|
|
fprintf(ttyout, "got remotepwd as `%s'\n", remotepwd);
|
|
|
|
goto cleanupremotepwd;
|
|
|
|
badremotepwd:
|
|
|
|
remotepwd[0]='\0';
|
|
|
|
cleanupremotepwd:
|
|
|
|
verbose = overbose;
|
|
|
|
code = ocode;
|
|
|
|
}
|
|
|
|
|
1999-06-21 02:07:28 +04:00
|
|
|
#ifndef NO_PROGRESS
|
1997-07-20 13:45:35 +04:00
|
|
|
|
1998-06-04 12:28:35 +04:00
|
|
|
/*
|
|
|
|
* return non-zero if we're the current foreground process
|
|
|
|
*/
|
|
|
|
int
|
2000-05-01 14:35:16 +04:00
|
|
|
foregroundproc(void)
|
[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
|
|
|
{
|
1997-06-11 01:59:58 +04:00
|
|
|
static pid_t pgrp = -1;
|
[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
|
|
|
|
1997-06-11 01:59:58 +04:00
|
|
|
if (pgrp == -1)
|
|
|
|
pgrp = getpgrp();
|
|
|
|
|
1999-09-26 18:18:01 +04:00
|
|
|
return (tcgetpgrp(fileno(ttyout)) == pgrp);
|
1998-06-04 12:28:35 +04:00
|
|
|
}
|
|
|
|
|
|
|
|
|
2000-05-01 14:35:16 +04:00
|
|
|
static void updateprogressmeter(int);
|
1998-06-04 12:28:35 +04:00
|
|
|
|
1999-10-13 06:47:54 +04:00
|
|
|
/*
|
|
|
|
* SIGALRM handler to update the progress meter
|
|
|
|
*/
|
1998-06-04 12:28:35 +04:00
|
|
|
static void
|
2000-05-01 14:35:16 +04:00
|
|
|
updateprogressmeter(int dummy)
|
1998-06-04 12:28:35 +04:00
|
|
|
{
|
1999-10-09 07:00:55 +04:00
|
|
|
int oerrno = errno;
|
1998-06-04 12:28:35 +04:00
|
|
|
|
1999-02-12 15:11:18 +03:00
|
|
|
progressmeter(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
|
|
|
errno = oerrno;
|
[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
|
|
|
}
|
1999-06-21 02:07:28 +04:00
|
|
|
#endif /* NO_PROGRESS */
|
[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
|
|
|
|
1999-01-01 05:05:05 +03:00
|
|
|
|
|
|
|
/*
|
|
|
|
* List of order of magnitude prefixes.
|
|
|
|
* The last is `P', as 2^64 = 16384 Petabytes
|
|
|
|
*/
|
|
|
|
static const char prefixes[] = " KMGTP";
|
|
|
|
|
1997-01-19 17:19:02 +03:00
|
|
|
/*
|
|
|
|
* Display a transfer progress bar if progress is non-zero.
|
[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
|
|
|
* SIGALRM is hijacked for use by this function.
|
|
|
|
* - Before the transfer, set filesize to size of file (or -1 if unknown),
|
|
|
|
* and call with flag = -1. This starts the once per second timer,
|
|
|
|
* and a call to updateprogressmeter() upon SIGALRM.
|
|
|
|
* - During the transfer, updateprogressmeter will call progressmeter
|
|
|
|
* with flag = 0
|
|
|
|
* - After the transfer, call with flag = 1
|
1997-01-19 17:19:02 +03:00
|
|
|
*/
|
|
|
|
static struct timeval start;
|
1998-01-20 07:39:34 +03:00
|
|
|
static struct timeval lastupdate;
|
1997-01-19 17:19:02 +03:00
|
|
|
|
1999-10-24 16:31:36 +04:00
|
|
|
#define BUFLEFT (sizeof(buf) - len)
|
1999-09-30 09:38:19 +04:00
|
|
|
|
1997-01-19 17:19:02 +03:00
|
|
|
void
|
2000-05-01 14:35:16 +04:00
|
|
|
progressmeter(int flag)
|
1997-01-19 17:19:02 +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
|
|
|
static off_t lastsize;
|
1999-06-26 04:17:02 +04:00
|
|
|
#ifndef NO_PROGRESS
|
[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
|
|
|
struct timeval now, td, wait;
|
1998-09-28 13:03:22 +04:00
|
|
|
off_t cursize, abbrevsize, bytespersec;
|
1997-11-01 17:36:49 +03:00
|
|
|
double elapsed;
|
|
|
|
int ratio, barlength, i, len, remaining;
|
1999-09-24 04:48:24 +04:00
|
|
|
|
|
|
|
/*
|
|
|
|
* Work variables for progress bar.
|
|
|
|
*
|
|
|
|
* XXX: if the format of the progress bar changes
|
|
|
|
* (especially the number of characters in the
|
|
|
|
* `static' portion of it), be sure to update
|
|
|
|
* these appropriately.
|
|
|
|
*/
|
|
|
|
char buf[256]; /* workspace for progress bar */
|
1999-10-24 16:31:36 +04:00
|
|
|
#define BAROVERHEAD 43 /* non `*' portion of progress bar */
|
1999-09-24 04:48:24 +04:00
|
|
|
/*
|
|
|
|
* stars should contain at least
|
|
|
|
* sizeof(buf) - BAROVERHEAD entries
|
|
|
|
*/
|
2002-06-08 18:44:07 +04:00
|
|
|
static const char stars[] =
|
1999-09-24 04:48:24 +04:00
|
|
|
"*****************************************************************************"
|
|
|
|
"*****************************************************************************"
|
|
|
|
"*****************************************************************************";
|
|
|
|
|
1999-06-26 04:17:02 +04:00
|
|
|
#endif
|
1997-01-19 17:19:02 +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 (flag == -1) {
|
1998-01-18 17:23:33 +03:00
|
|
|
(void)gettimeofday(&start, NULL);
|
[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
|
|
|
lastupdate = start;
|
|
|
|
lastsize = restart_point;
|
|
|
|
}
|
1999-06-26 04:17:02 +04:00
|
|
|
#ifndef NO_PROGRESS
|
2001-02-19 23:02:42 +03:00
|
|
|
if (!progress)
|
1997-01-19 17:19:02 +03:00
|
|
|
return;
|
2001-02-19 23:02:42 +03:00
|
|
|
len = 0;
|
1999-02-12 15:11:18 +03:00
|
|
|
|
2000-08-27 10:31:23 +04:00
|
|
|
/*
|
|
|
|
* print progress bar only if we are foreground process.
|
|
|
|
*/
|
|
|
|
if (! foregroundproc())
|
|
|
|
return;
|
|
|
|
|
1999-02-12 15:11:18 +03:00
|
|
|
(void)gettimeofday(&now, NULL);
|
1997-01-19 17:19:02 +03:00
|
|
|
cursize = bytes + restart_point;
|
1999-02-12 15:11:18 +03:00
|
|
|
timersub(&now, &lastupdate, &wait);
|
|
|
|
if (cursize > lastsize) {
|
|
|
|
lastupdate = now;
|
|
|
|
lastsize = cursize;
|
|
|
|
wait.tv_sec = 0;
|
|
|
|
}
|
|
|
|
|
2001-02-19 23:02:42 +03:00
|
|
|
len += snprintf(buf + len, BUFLEFT, "\r");
|
|
|
|
if (filesize > 0) {
|
|
|
|
ratio = (int)((double)cursize * 100.0 / (double)filesize);
|
|
|
|
ratio = MAX(ratio, 0);
|
|
|
|
ratio = MIN(ratio, 100);
|
|
|
|
len += snprintf(buf + len, BUFLEFT, "%3d%% ", ratio);
|
1997-01-19 17:19:02 +03:00
|
|
|
|
1999-09-24 04:48:24 +04:00
|
|
|
/*
|
|
|
|
* calculate the length of the `*' bar, ensuring that
|
|
|
|
* the number of stars won't exceed the buffer size
|
|
|
|
*/
|
2001-02-19 23:02:42 +03:00
|
|
|
barlength = MIN(sizeof(buf) - 1, ttywidth) - BAROVERHEAD;
|
|
|
|
if (barlength > 0) {
|
|
|
|
i = barlength * ratio / 100;
|
|
|
|
len += snprintf(buf + len, BUFLEFT,
|
|
|
|
"|%.*s%*s|", i, stars, barlength - i, "");
|
|
|
|
}
|
1997-01-19 17:19:02 +03:00
|
|
|
}
|
|
|
|
|
|
|
|
abbrevsize = cursize;
|
1998-09-28 13:03:22 +04:00
|
|
|
for (i = 0; abbrevsize >= 100000 && i < sizeof(prefixes); i++)
|
1997-01-19 17:19:02 +03:00
|
|
|
abbrevsize >>= 10;
|
2000-08-02 02:47:25 +04:00
|
|
|
len += snprintf(buf + len, BUFLEFT, " " LLFP("5") " %c%c ",
|
|
|
|
(LLT)abbrevsize,
|
1999-01-01 05:05:05 +03:00
|
|
|
prefixes[i],
|
1998-09-28 13:03:22 +04:00
|
|
|
i == 0 ? ' ' : 'B');
|
1997-01-19 17:19:02 +03:00
|
|
|
|
|
|
|
timersub(&now, &start, &td);
|
|
|
|
elapsed = td.tv_sec + (td.tv_usec / 1000000.0);
|
[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
|
|
|
|
1998-09-28 13:03:22 +04:00
|
|
|
bytespersec = 0;
|
|
|
|
if (bytes > 0) {
|
|
|
|
bytespersec = bytes;
|
|
|
|
if (elapsed > 0.0)
|
|
|
|
bytespersec /= elapsed;
|
|
|
|
}
|
1999-01-01 06:55:26 +03:00
|
|
|
for (i = 1; bytespersec >= 1024000 && i < sizeof(prefixes); i++)
|
1998-09-28 13:03:22 +04:00
|
|
|
bytespersec >>= 10;
|
1999-09-28 13:12:06 +04:00
|
|
|
len += snprintf(buf + len, BUFLEFT,
|
2000-08-02 02:47:25 +04:00
|
|
|
" " LLFP("3") ".%02d %cB/s ",
|
|
|
|
(LLT)(bytespersec / 1024),
|
1999-01-01 06:55:26 +03:00
|
|
|
(int)((bytespersec % 1024) * 100 / 1024),
|
1999-01-01 05:05:05 +03:00
|
|
|
prefixes[i]);
|
1998-09-28 13:03:22 +04:00
|
|
|
|
2001-02-19 23:02:42 +03:00
|
|
|
if (filesize > 0) {
|
|
|
|
if (bytes <= 0 || elapsed <= 0.0 || cursize > filesize) {
|
1999-09-28 13:12:06 +04:00
|
|
|
len += snprintf(buf + len, BUFLEFT, " --:-- ETA");
|
2002-06-05 14:20:46 +04:00
|
|
|
} else if (flag == 1) {
|
|
|
|
i = elapsed / SECSPERHOUR;
|
|
|
|
if (i)
|
|
|
|
len += snprintf(buf + len, BUFLEFT, "%2d:", i);
|
|
|
|
else
|
|
|
|
len += snprintf(buf + len, BUFLEFT, " ");
|
|
|
|
i = (int)elapsed % SECSPERHOUR;
|
|
|
|
len += snprintf(buf + len, BUFLEFT,
|
|
|
|
"%02d:%02d ", i / 60, i % 60);
|
2001-02-19 23:02:42 +03:00
|
|
|
} else if (wait.tv_sec >= STALLTIME) {
|
|
|
|
len += snprintf(buf + len, BUFLEFT, " - stalled -");
|
|
|
|
} else {
|
|
|
|
remaining = (int)
|
|
|
|
((filesize - restart_point) / (bytes / elapsed) -
|
|
|
|
elapsed);
|
|
|
|
if (remaining >= 100 * SECSPERHOUR)
|
|
|
|
len += snprintf(buf + len, BUFLEFT,
|
|
|
|
" --:-- ETA");
|
|
|
|
else {
|
|
|
|
i = remaining / SECSPERHOUR;
|
|
|
|
if (i)
|
|
|
|
len += snprintf(buf + len, BUFLEFT,
|
|
|
|
"%2d:", i);
|
|
|
|
else
|
|
|
|
len += snprintf(buf + len, BUFLEFT,
|
|
|
|
" ");
|
|
|
|
i = remaining % SECSPERHOUR;
|
|
|
|
len += snprintf(buf + len, BUFLEFT,
|
|
|
|
"%02d:%02d ETA", i / 60, i % 60);
|
|
|
|
}
|
1997-10-11 16:05:15 +04:00
|
|
|
}
|
1997-01-19 17:19:02 +03:00
|
|
|
}
|
1999-09-28 13:12:06 +04:00
|
|
|
if (flag == 1)
|
|
|
|
len += snprintf(buf + len, BUFLEFT, "\n");
|
1999-01-31 05:29:00 +03:00
|
|
|
(void)write(fileno(ttyout), buf, len);
|
1997-01-19 17:19:02 +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 (flag == -1) {
|
1999-10-05 04:54:07 +04:00
|
|
|
(void)xsignal_restart(SIGALRM, updateprogressmeter, 1);
|
[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(1); /* set alarm timer for 1 Hz */
|
|
|
|
} else if (flag == 1) {
|
1998-08-08 10:46:01 +04:00
|
|
|
(void)xsignal(SIGALRM, SIG_DFL);
|
[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);
|
|
|
|
}
|
1999-06-26 04:17:02 +04:00
|
|
|
#endif /* !NO_PROGRESS */
|
1997-01-19 17:19:02 +03:00
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Display transfer statistics.
|
|
|
|
* Requires start to be initialised by progressmeter(-1),
|
|
|
|
* direction to be defined by xfer routines, and filesize and bytes
|
|
|
|
* to be updated by xfer routines
|
1998-06-04 12:28:35 +04:00
|
|
|
* If siginfo is nonzero, an ETA is displayed, and the output goes to stderr
|
|
|
|
* instead of ttyout.
|
1997-01-19 17:19:02 +03:00
|
|
|
*/
|
|
|
|
void
|
2000-05-01 14:35:16 +04:00
|
|
|
ptransfer(int siginfo)
|
1997-01-19 17:19:02 +03:00
|
|
|
{
|
1998-01-20 07:39:34 +03:00
|
|
|
struct timeval now, td, wait;
|
1997-01-19 17:19:02 +03:00
|
|
|
double elapsed;
|
1998-09-28 13:03:22 +04:00
|
|
|
off_t bytespersec;
|
1999-01-01 05:05:05 +03:00
|
|
|
int remaining, hh, i, len;
|
1999-09-24 04:48:24 +04:00
|
|
|
|
1999-09-28 13:12:06 +04:00
|
|
|
char buf[256]; /* Work variable for transfer status. */
|
1997-01-19 17:19:02 +03:00
|
|
|
|
1999-06-26 04:17:02 +04:00
|
|
|
if (!verbose && !progress && !siginfo)
|
1997-01-19 17:19:02 +03:00
|
|
|
return;
|
|
|
|
|
1998-01-18 17:23:33 +03:00
|
|
|
(void)gettimeofday(&now, NULL);
|
1997-01-19 17:19:02 +03:00
|
|
|
timersub(&now, &start, &td);
|
|
|
|
elapsed = td.tv_sec + (td.tv_usec / 1000000.0);
|
1998-09-28 13:03:22 +04:00
|
|
|
bytespersec = 0;
|
|
|
|
if (bytes > 0) {
|
|
|
|
bytespersec = bytes;
|
|
|
|
if (elapsed > 0.0)
|
|
|
|
bytespersec /= elapsed;
|
|
|
|
}
|
1997-11-01 17:36:49 +03:00
|
|
|
len = 0;
|
2000-08-02 02:47:25 +04:00
|
|
|
len += snprintf(buf + len, BUFLEFT, LLF " byte%s %s in ",
|
|
|
|
(LLT)bytes, bytes == 1 ? "" : "s", direction);
|
1998-01-20 07:39:34 +03:00
|
|
|
remaining = (int)elapsed;
|
|
|
|
if (remaining > SECSPERDAY) {
|
|
|
|
int days;
|
|
|
|
|
|
|
|
days = remaining / SECSPERDAY;
|
|
|
|
remaining %= SECSPERDAY;
|
1999-09-28 13:12:06 +04:00
|
|
|
len += snprintf(buf + len, BUFLEFT,
|
|
|
|
"%d day%s ", days, days == 1 ? "" : "s");
|
1998-01-20 07:39:34 +03:00
|
|
|
}
|
|
|
|
hh = remaining / SECSPERHOUR;
|
|
|
|
remaining %= SECSPERHOUR;
|
|
|
|
if (hh)
|
1999-09-28 13:12:06 +04:00
|
|
|
len += snprintf(buf + len, BUFLEFT, "%2d:", hh);
|
|
|
|
len += snprintf(buf + len, BUFLEFT,
|
|
|
|
"%02d:%02d ", remaining / 60, remaining % 60);
|
1999-01-01 05:05:05 +03:00
|
|
|
|
1999-01-01 06:55:26 +03:00
|
|
|
for (i = 1; bytespersec >= 1024000 && i < sizeof(prefixes); i++)
|
1999-01-01 05:05:05 +03:00
|
|
|
bytespersec >>= 10;
|
2000-08-02 02:47:25 +04:00
|
|
|
len += snprintf(buf + len, BUFLEFT, "(" LLF ".%02d %cB/s)",
|
|
|
|
(LLT)(bytespersec / 1024),
|
1999-01-01 06:55:26 +03:00
|
|
|
(int)((bytespersec % 1024) * 100 / 1024),
|
1999-01-01 05:05:05 +03:00
|
|
|
prefixes[i]);
|
1998-01-20 07:39:34 +03:00
|
|
|
|
1997-05-12 15:41:13 +04:00
|
|
|
if (siginfo && bytes > 0 && elapsed > 0.0 && filesize >= 0
|
|
|
|
&& bytes + restart_point <= filesize) {
|
1997-01-19 17:19:02 +03:00
|
|
|
remaining = (int)((filesize - restart_point) /
|
|
|
|
(bytes / elapsed) - elapsed);
|
1997-11-01 17:36:49 +03:00
|
|
|
hh = remaining / SECSPERHOUR;
|
|
|
|
remaining %= SECSPERHOUR;
|
1999-09-28 13:12:06 +04:00
|
|
|
len += snprintf(buf + len, BUFLEFT, " ETA: ");
|
1998-01-20 07:39:34 +03:00
|
|
|
if (hh)
|
1999-09-28 13:12:06 +04:00
|
|
|
len += snprintf(buf + len, BUFLEFT, "%2d:", hh);
|
|
|
|
len += snprintf(buf + len, BUFLEFT, "%02d:%02d",
|
1999-09-24 04:48:24 +04:00
|
|
|
remaining / 60, remaining % 60);
|
1998-01-20 07:39:34 +03:00
|
|
|
timersub(&now, &lastupdate, &wait);
|
|
|
|
if (wait.tv_sec >= STALLTIME)
|
1999-09-28 13:12:06 +04:00
|
|
|
len += snprintf(buf + len, BUFLEFT, " (stalled)");
|
1997-01-19 17:19:02 +03:00
|
|
|
}
|
1999-09-28 13:12:06 +04:00
|
|
|
len += snprintf(buf + len, BUFLEFT, "\n");
|
1999-01-31 05:29:00 +03:00
|
|
|
(void)write(siginfo ? STDERR_FILENO : fileno(ttyout), buf, len);
|
1997-01-19 17:19:02 +03:00
|
|
|
}
|
|
|
|
|
1999-10-05 17:05:39 +04:00
|
|
|
/*
|
1999-10-13 06:47:54 +04:00
|
|
|
* SIG{INFO,QUIT} handler to print transfer stats if a transfer is in progress
|
1999-10-05 17:05:39 +04:00
|
|
|
*/
|
|
|
|
void
|
2000-05-01 14:35:16 +04:00
|
|
|
psummary(int notused)
|
1999-10-05 17:05:39 +04:00
|
|
|
{
|
1999-10-09 07:00:55 +04:00
|
|
|
int oerrno = errno;
|
1999-10-05 17:05:39 +04:00
|
|
|
|
1999-10-11 16:35:42 +04:00
|
|
|
if (bytes > 0) {
|
1999-10-12 10:04:59 +04:00
|
|
|
if (fromatty)
|
|
|
|
write(fileno(ttyout), "\n", 1);
|
1999-10-05 17:05:39 +04:00
|
|
|
ptransfer(1);
|
1999-10-11 16:35:42 +04:00
|
|
|
}
|
1999-10-05 17:05:39 +04:00
|
|
|
errno = oerrno;
|
|
|
|
}
|
|
|
|
|
1997-01-19 17:19:02 +03:00
|
|
|
/*
|
|
|
|
* List words in stringlist, vertically arranged
|
|
|
|
*/
|
|
|
|
void
|
2000-05-01 14:35:16 +04:00
|
|
|
list_vertical(StringList *sl)
|
1997-01-19 17:19:02 +03:00
|
|
|
{
|
|
|
|
int i, j, w;
|
2000-08-27 10:31:23 +04:00
|
|
|
int columns, width, lines;
|
1997-01-19 17:19:02 +03:00
|
|
|
char *p;
|
|
|
|
|
2000-08-27 10:31:23 +04:00
|
|
|
width = 0;
|
1997-01-19 17:19:02 +03:00
|
|
|
|
|
|
|
for (i = 0 ; i < sl->sl_cur ; i++) {
|
|
|
|
w = strlen(sl->sl_str[i]);
|
|
|
|
if (w > width)
|
|
|
|
width = w;
|
|
|
|
}
|
|
|
|
width = (width + 8) &~ 7;
|
|
|
|
|
|
|
|
columns = ttywidth / width;
|
|
|
|
if (columns == 0)
|
|
|
|
columns = 1;
|
|
|
|
lines = (sl->sl_cur + columns - 1) / columns;
|
|
|
|
for (i = 0; i < lines; i++) {
|
|
|
|
for (j = 0; j < columns; j++) {
|
|
|
|
p = sl->sl_str[j * lines + i];
|
|
|
|
if (p)
|
1998-06-04 12:28:35 +04:00
|
|
|
fputs(p, ttyout);
|
1997-01-19 17:19:02 +03:00
|
|
|
if (j * lines + i + lines >= sl->sl_cur) {
|
1998-06-04 12:28:35 +04:00
|
|
|
putc('\n', ttyout);
|
1997-01-19 17:19:02 +03:00
|
|
|
break;
|
|
|
|
}
|
|
|
|
w = strlen(p);
|
|
|
|
while (w < width) {
|
|
|
|
w = (w + 8) &~ 7;
|
1998-06-04 12:28:35 +04:00
|
|
|
(void)putc('\t', ttyout);
|
1997-01-19 17:19:02 +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
|
|
|
|
|
|
|
/*
|
|
|
|
* Update the global ttywidth value, using TIOCGWINSZ.
|
|
|
|
*/
|
|
|
|
void
|
2000-05-01 14:35:16 +04:00
|
|
|
setttywidth(int a)
|
[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
|
|
|
{
|
|
|
|
struct winsize winsize;
|
1999-10-09 07:00:55 +04:00
|
|
|
int oerrno = errno;
|
[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
|
|
|
|
1998-09-28 13:03:22 +04:00
|
|
|
if (ioctl(fileno(ttyout), TIOCGWINSZ, &winsize) != -1 &&
|
|
|
|
winsize.ws_col != 0)
|
[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
|
|
|
ttywidth = winsize.ws_col;
|
|
|
|
else
|
|
|
|
ttywidth = 80;
|
[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;
|
[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
|
|
|
}
|
|
|
|
|
1999-10-05 17:05:39 +04:00
|
|
|
/*
|
|
|
|
* Change the rate limit up (SIGUSR1) or down (SIGUSR2)
|
|
|
|
*/
|
[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
|
|
|
void
|
2000-05-01 14:35:16 +04:00
|
|
|
crankrate(int sig)
|
[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
|
|
|
{
|
|
|
|
|
|
|
|
switch (sig) {
|
|
|
|
case SIGUSR1:
|
|
|
|
if (rate_get)
|
|
|
|
rate_get += rate_get_incr;
|
|
|
|
if (rate_put)
|
|
|
|
rate_put += rate_put_incr;
|
|
|
|
break;
|
|
|
|
case SIGUSR2:
|
|
|
|
if (rate_get && rate_get > rate_get_incr)
|
|
|
|
rate_get -= rate_get_incr;
|
|
|
|
if (rate_put && rate_put > rate_put_incr)
|
|
|
|
rate_put -= rate_put_incr;
|
|
|
|
break;
|
|
|
|
default:
|
|
|
|
err(1, "crankrate invoked with unknown signal: %d", sig);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
[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
|
|
|
/*
|
|
|
|
* Set the SIGALRM interval timer for wait seconds, 0 to disable.
|
|
|
|
*/
|
|
|
|
void
|
2000-05-01 14:35:16 +04:00
|
|
|
alarmtimer(int wait)
|
[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
|
|
|
{
|
|
|
|
struct itimerval itv;
|
|
|
|
|
|
|
|
itv.it_value.tv_sec = wait;
|
|
|
|
itv.it_value.tv_usec = 0;
|
|
|
|
itv.it_interval = itv.it_value;
|
|
|
|
setitimer(ITIMER_REAL, &itv, NULL);
|
|
|
|
}
|
1997-04-05 07:27:32 +04:00
|
|
|
|
|
|
|
/*
|
|
|
|
* Setup or cleanup EditLine structures
|
|
|
|
*/
|
1999-06-21 02:07:28 +04:00
|
|
|
#ifndef NO_EDITCOMPLETE
|
1997-04-05 07:27:32 +04:00
|
|
|
void
|
2000-05-01 14:35:16 +04:00
|
|
|
controlediting(void)
|
1997-04-05 07:27:32 +04:00
|
|
|
{
|
|
|
|
if (editing && el == NULL && hist == NULL) {
|
1997-10-14 20:31:22 +04:00
|
|
|
HistEvent ev;
|
1998-07-29 06:46:26 +04:00
|
|
|
int editmode;
|
1997-10-14 20:31:22 +04:00
|
|
|
|
2001-02-20 02:03:42 +03:00
|
|
|
el = el_init(getprogname(), stdin, ttyout, stderr);
|
1998-05-20 04:55:52 +04:00
|
|
|
/* init editline */
|
1997-04-05 07:27:32 +04:00
|
|
|
hist = history_init(); /* init the builtin history */
|
1998-05-20 04:55:52 +04:00
|
|
|
history(hist, &ev, H_SETSIZE, 100);/* remember 100 events */
|
1997-04-05 07:27:32 +04:00
|
|
|
el_set(el, EL_HIST, history, hist); /* use history */
|
|
|
|
|
|
|
|
el_set(el, EL_EDITOR, "emacs"); /* default editor is emacs */
|
1999-11-12 05:50:38 +03:00
|
|
|
el_set(el, EL_PROMPT, prompt); /* set the prompt functions */
|
|
|
|
el_set(el, EL_RPROMPT, rprompt);
|
1997-04-05 07:27:32 +04:00
|
|
|
|
|
|
|
/* add local file completion, bind to TAB */
|
|
|
|
el_set(el, EL_ADDFN, "ftp-complete",
|
|
|
|
"Context sensitive argument completion",
|
|
|
|
complete);
|
|
|
|
el_set(el, EL_BIND, "^I", "ftp-complete", NULL);
|
|
|
|
el_source(el, NULL); /* read ~/.editrc */
|
1998-07-29 06:46:26 +04:00
|
|
|
if ((el_get(el, EL_EDITMODE, &editmode) != -1) && editmode == 0)
|
|
|
|
editing = 0; /* the user doesn't want editing,
|
|
|
|
* so disable, and let statement
|
|
|
|
* below cleanup */
|
|
|
|
else
|
|
|
|
el_set(el, EL_SIGNAL, 1);
|
|
|
|
}
|
|
|
|
if (!editing) {
|
1997-04-05 07:27:32 +04:00
|
|
|
if (hist) {
|
|
|
|
history_end(hist);
|
|
|
|
hist = NULL;
|
|
|
|
}
|
|
|
|
if (el) {
|
|
|
|
el_end(el);
|
|
|
|
el = NULL;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
1999-06-21 02:07:28 +04:00
|
|
|
#endif /* !NO_EDITCOMPLETE */
|
1998-07-10 08:39:03 +04: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
|
|
|
* Convert the string `arg' to an int, which may have an optional SI suffix
|
|
|
|
* (`b', `k', `m', `g'). Returns the number for success, -1 otherwise.
|
1998-07-10 08:39:03 +04:00
|
|
|
*/
|
|
|
|
int
|
2000-05-01 14:35:16 +04:00
|
|
|
strsuftoi(const char *arg)
|
1998-07-10 08:39:03 +04:00
|
|
|
{
|
|
|
|
char *cp;
|
[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
|
|
|
long val;
|
1998-07-10 08:39:03 +04:00
|
|
|
|
1998-11-06 19:52:42 +03:00
|
|
|
if (!isdigit((unsigned char)arg[0]))
|
1998-07-10 08:39:03 +04:00
|
|
|
return (-1);
|
|
|
|
|
|
|
|
val = strtol(arg, &cp, 10);
|
|
|
|
if (cp != NULL) {
|
[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
|
|
|
if (cp[0] != '\0' && cp[1] != '\0')
|
1998-07-10 08:39:03 +04:00
|
|
|
return (-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
|
|
|
switch (tolower((unsigned char)cp[0])) {
|
|
|
|
case '\0':
|
|
|
|
case 'b':
|
|
|
|
break;
|
|
|
|
case 'k':
|
|
|
|
val <<= 10;
|
|
|
|
break;
|
|
|
|
case 'm':
|
|
|
|
val <<= 20;
|
|
|
|
break;
|
|
|
|
case 'g':
|
|
|
|
val <<= 30;
|
|
|
|
break;
|
|
|
|
default:
|
|
|
|
return (-1);
|
|
|
|
}
|
1998-07-10 08:39:03 +04: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
|
|
|
if (val < 0 || val > INT_MAX)
|
1998-07-10 08:39:03 +04:00
|
|
|
return (-1);
|
|
|
|
|
|
|
|
return (val);
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Set up socket buffer sizes before a connection is made.
|
|
|
|
*/
|
|
|
|
void
|
2000-05-01 14:35:16 +04:00
|
|
|
setupsockbufsize(int sock)
|
1998-07-10 08:39:03 +04:00
|
|
|
{
|
|
|
|
|
1999-09-22 11:18:31 +04:00
|
|
|
if (setsockopt(sock, SOL_SOCKET, SO_SNDBUF, (void *) &sndbuf_size,
|
|
|
|
sizeof(rcvbuf_size)) < 0)
|
|
|
|
warn("unable to set sndbuf size %d", sndbuf_size);
|
1998-07-10 08:39:03 +04:00
|
|
|
|
1999-09-22 11:18:31 +04:00
|
|
|
if (setsockopt(sock, SOL_SOCKET, SO_RCVBUF, (void *) &rcvbuf_size,
|
|
|
|
sizeof(rcvbuf_size)) < 0)
|
|
|
|
warn("unable to set rcvbuf size %d", rcvbuf_size);
|
1998-07-10 08:39:03 +04:00
|
|
|
}
|
|
|
|
|
1999-10-13 06:47:54 +04:00
|
|
|
/*
|
|
|
|
* Copy characters from src into dst, \ quoting characters that require it
|
|
|
|
*/
|
1999-02-07 16:14:06 +03:00
|
|
|
void
|
2000-05-01 14:35:16 +04:00
|
|
|
ftpvis(char *dst, size_t dstlen, const char *src, size_t srclen)
|
1999-02-07 16:14:06 +03:00
|
|
|
{
|
|
|
|
int di, si;
|
|
|
|
|
|
|
|
for (di = si = 0;
|
|
|
|
src[si] != '\0' && di < dstlen && si < srclen;
|
|
|
|
di++, si++) {
|
|
|
|
switch (src[si]) {
|
|
|
|
case '\\':
|
|
|
|
case ' ':
|
|
|
|
case '\t':
|
|
|
|
case '\r':
|
1999-02-07 16:15:12 +03:00
|
|
|
case '\n':
|
1999-02-07 16:14:06 +03:00
|
|
|
case '"':
|
|
|
|
dst[di++] = '\\';
|
|
|
|
if (di >= dstlen)
|
|
|
|
break;
|
|
|
|
/* FALLTHROUGH */
|
|
|
|
default:
|
|
|
|
dst[di] = src[si];
|
|
|
|
}
|
|
|
|
}
|
|
|
|
dst[di] = '\0';
|
|
|
|
}
|
|
|
|
|
1999-11-12 05:50:38 +03:00
|
|
|
/*
|
|
|
|
* Copy src into buf (which is len bytes long), expanding % sequences.
|
|
|
|
*/
|
|
|
|
void
|
2000-05-01 14:35:16 +04:00
|
|
|
formatbuf(char *buf, size_t len, const char *src)
|
1999-11-12 05:50:38 +03:00
|
|
|
{
|
|
|
|
const char *p;
|
|
|
|
char *p2, *q;
|
|
|
|
int i, op, updirs, pdirs;
|
|
|
|
|
|
|
|
#define ADDBUF(x) do { \
|
|
|
|
if (i >= len - 1) \
|
|
|
|
goto endbuf; \
|
|
|
|
buf[i++] = (x); \
|
|
|
|
} while (0)
|
|
|
|
|
|
|
|
p = src;
|
|
|
|
for (i = 0; *p; p++) {
|
|
|
|
if (*p != '%') {
|
|
|
|
ADDBUF(*p);
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
p++;
|
|
|
|
|
|
|
|
switch (op = *p) {
|
|
|
|
|
|
|
|
case '/':
|
|
|
|
case '.':
|
|
|
|
case 'c':
|
|
|
|
p2 = connected ? remotepwd : "";
|
|
|
|
updirs = pdirs = 0;
|
|
|
|
|
|
|
|
/* option to determine fixed # of dirs from path */
|
|
|
|
if (op == '.' || op == 'c') {
|
|
|
|
int skip;
|
|
|
|
|
|
|
|
q = p2;
|
|
|
|
while (*p2) /* calc # of /'s */
|
|
|
|
if (*p2++ == '/')
|
|
|
|
updirs++;
|
|
|
|
if (p[1] == '0') { /* print <x> or ... */
|
|
|
|
pdirs = 1;
|
|
|
|
p++;
|
|
|
|
}
|
|
|
|
if (p[1] >= '1' && p[1] <= '9') {
|
|
|
|
/* calc # to skip */
|
|
|
|
skip = p[1] - '0';
|
|
|
|
p++;
|
|
|
|
} else
|
|
|
|
skip = 1;
|
|
|
|
|
|
|
|
updirs -= skip;
|
|
|
|
while (skip-- > 0) {
|
|
|
|
while ((p2 > q) && (*p2 != '/'))
|
|
|
|
p2--; /* back up */
|
|
|
|
if (skip && p2 > q)
|
|
|
|
p2--;
|
|
|
|
}
|
|
|
|
if (*p2 == '/' && p2 != q)
|
|
|
|
p2++;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (updirs > 0 && pdirs) {
|
|
|
|
if (i >= len - 5)
|
|
|
|
break;
|
|
|
|
if (op == '.') {
|
|
|
|
ADDBUF('.');
|
|
|
|
ADDBUF('.');
|
|
|
|
ADDBUF('.');
|
|
|
|
} else {
|
|
|
|
ADDBUF('/');
|
|
|
|
ADDBUF('<');
|
|
|
|
if (updirs > 9) {
|
|
|
|
ADDBUF('9');
|
|
|
|
ADDBUF('+');
|
|
|
|
} else
|
|
|
|
ADDBUF('0' + updirs);
|
|
|
|
ADDBUF('>');
|
|
|
|
}
|
|
|
|
}
|
|
|
|
for (; *p2; p2++)
|
|
|
|
ADDBUF(*p2);
|
|
|
|
break;
|
|
|
|
|
|
|
|
case 'M':
|
|
|
|
case 'm':
|
|
|
|
for (p2 = connected ? hostname : "-"; *p2; p2++) {
|
|
|
|
if (op == 'm' && *p2 == '.')
|
|
|
|
break;
|
|
|
|
ADDBUF(*p2);
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
|
|
|
|
case 'n':
|
|
|
|
for (p2 = connected ? username : "-"; *p2 ; p2++)
|
|
|
|
ADDBUF(*p2);
|
|
|
|
break;
|
|
|
|
|
|
|
|
case '%':
|
|
|
|
ADDBUF('%');
|
|
|
|
break;
|
|
|
|
|
|
|
|
default: /* display unknown codes literally */
|
|
|
|
ADDBUF('%');
|
|
|
|
ADDBUF(op);
|
|
|
|
break;
|
|
|
|
|
|
|
|
}
|
|
|
|
}
|
|
|
|
endbuf:
|
|
|
|
buf[i] = '\0';
|
|
|
|
}
|
|
|
|
|
2000-08-06 12:51:22 +04:00
|
|
|
/*
|
|
|
|
* Parse `port' into a TCP port number, defaulting to `defport' if `port' is
|
|
|
|
* an unknown service name. If defport != -1, print a warning upon bad parse.
|
|
|
|
*/
|
|
|
|
int
|
|
|
|
parseport(const char *port, int defport)
|
|
|
|
{
|
|
|
|
int rv;
|
|
|
|
long nport;
|
|
|
|
char *p, *ep;
|
|
|
|
|
|
|
|
p = xstrdup(port);
|
|
|
|
nport = strtol(p, &ep, 10);
|
|
|
|
if (*ep != '\0' && ep == p) {
|
|
|
|
struct servent *svp;
|
|
|
|
|
|
|
|
svp = getservbyname(port, "tcp");
|
|
|
|
if (svp == NULL) {
|
|
|
|
badparseport:
|
|
|
|
if (defport != -1)
|
|
|
|
warnx("Unknown port `%s', using port %d",
|
|
|
|
port, defport);
|
|
|
|
rv = defport;
|
|
|
|
} else
|
|
|
|
rv = ntohs(svp->s_port);
|
|
|
|
} else if (nport < 1 || nport > MAX_IN_PORT_T || *ep != '\0')
|
|
|
|
goto badparseport;
|
|
|
|
else
|
|
|
|
rv = nport;
|
|
|
|
free(p);
|
|
|
|
return (rv);
|
|
|
|
}
|
|
|
|
|
1999-07-12 17:20:34 +04:00
|
|
|
/*
|
|
|
|
* Determine if given string is an IPv6 address or not.
|
|
|
|
* Return 1 for yes, 0 for no
|
|
|
|
*/
|
|
|
|
int
|
2000-05-01 14:35:16 +04:00
|
|
|
isipv6addr(const char *addr)
|
1999-07-12 17:20:34 +04:00
|
|
|
{
|
|
|
|
int rv = 0;
|
|
|
|
#ifdef INET6
|
2000-04-24 09:59:39 +04:00
|
|
|
struct addrinfo hints, *res;
|
|
|
|
|
|
|
|
memset(&hints, 0, sizeof(hints));
|
|
|
|
hints.ai_family = PF_INET6;
|
|
|
|
hints.ai_socktype = SOCK_DGRAM; /*dummy*/
|
|
|
|
hints.ai_flags = AI_NUMERICHOST;
|
|
|
|
if (getaddrinfo(addr, "0", &hints, &res) != 0)
|
|
|
|
rv = 0;
|
|
|
|
else {
|
|
|
|
rv = 1;
|
|
|
|
freeaddrinfo(res);
|
|
|
|
}
|
1999-07-12 17:20:34 +04:00
|
|
|
if (debug)
|
|
|
|
fprintf(ttyout, "isipv6addr: got %d for %s\n", rv, addr);
|
|
|
|
#endif
|
1999-12-03 09:10:01 +03:00
|
|
|
return (rv == 1) ? 1 : 0;
|
1999-07-12 17:20:34 +04:00
|
|
|
}
|
|
|
|
|
|
|
|
|
1998-07-10 08:39:03 +04:00
|
|
|
/*
|
|
|
|
* Internal version of connect(2); sets socket buffer sizes first.
|
|
|
|
*/
|
|
|
|
int
|
2000-05-01 14:35:16 +04:00
|
|
|
xconnect(int sock, const struct sockaddr *name, int namelen)
|
1998-07-10 08:39:03 +04:00
|
|
|
{
|
|
|
|
|
|
|
|
setupsockbufsize(sock);
|
|
|
|
return (connect(sock, name, namelen));
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Internal version of listen(2); sets socket buffer sizes first.
|
|
|
|
*/
|
|
|
|
int
|
2000-05-01 14:35:16 +04:00
|
|
|
xlisten(int sock, int backlog)
|
1998-07-10 08:39:03 +04:00
|
|
|
{
|
|
|
|
|
|
|
|
setupsockbufsize(sock);
|
|
|
|
return (listen(sock, backlog));
|
|
|
|
}
|
1998-08-03 05:49:25 +04:00
|
|
|
|
1999-10-13 06:47:54 +04:00
|
|
|
/*
|
|
|
|
* malloc() with inbuilt error checking
|
|
|
|
*/
|
1998-08-03 05:49:25 +04:00
|
|
|
void *
|
2000-05-01 14:35:16 +04:00
|
|
|
xmalloc(size_t size)
|
1998-08-03 05:49:25 +04:00
|
|
|
{
|
|
|
|
void *p;
|
|
|
|
|
|
|
|
p = malloc(size);
|
|
|
|
if (p == NULL)
|
|
|
|
err(1, "Unable to allocate %ld bytes of memory", (long)size);
|
|
|
|
return (p);
|
|
|
|
}
|
|
|
|
|
1999-11-28 09:32:04 +03:00
|
|
|
/*
|
|
|
|
* sl_init() with inbuilt error checking
|
|
|
|
*/
|
|
|
|
StringList *
|
2000-05-01 14:35:16 +04:00
|
|
|
xsl_init(void)
|
1999-11-28 09:32:04 +03:00
|
|
|
{
|
|
|
|
StringList *p;
|
|
|
|
|
|
|
|
p = sl_init();
|
|
|
|
if (p == NULL)
|
|
|
|
err(1, "Unable to allocate memory for stringlist");
|
|
|
|
return (p);
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* sl_add() with inbuilt error checking
|
|
|
|
*/
|
|
|
|
void
|
2000-05-01 14:35:16 +04:00
|
|
|
xsl_add(StringList *sl, char *i)
|
1999-11-28 09:32:04 +03:00
|
|
|
{
|
|
|
|
|
|
|
|
if (sl_add(sl, i) == -1)
|
|
|
|
err(1, "Unable to add `%s' to stringlist", i);
|
|
|
|
}
|
|
|
|
|
1999-10-13 06:47:54 +04:00
|
|
|
/*
|
|
|
|
* strdup() with inbuilt error checking
|
|
|
|
*/
|
1998-08-03 05:49:25 +04:00
|
|
|
char *
|
2000-05-01 14:35:16 +04:00
|
|
|
xstrdup(const char *str)
|
1998-08-03 05:49:25 +04:00
|
|
|
{
|
|
|
|
char *s;
|
|
|
|
|
|
|
|
if (str == NULL)
|
|
|
|
errx(1, "xstrdup() called with NULL argument");
|
|
|
|
s = strdup(str);
|
|
|
|
if (s == NULL)
|
|
|
|
err(1, "Unable to allocate memory for string copy");
|
|
|
|
return (s);
|
|
|
|
}
|
1998-08-08 10:46:01 +04:00
|
|
|
|
1999-10-13 06:47:54 +04:00
|
|
|
/*
|
|
|
|
* Install a POSIX signal handler, allowing the invoker to set whether
|
|
|
|
* the signal should be restartable or not
|
|
|
|
*/
|
2000-02-01 01:01:03 +03:00
|
|
|
sigfunc
|
2000-05-01 14:35:16 +04:00
|
|
|
xsignal_restart(int sig, sigfunc func, int restartable)
|
1998-08-08 10:46:01 +04:00
|
|
|
{
|
|
|
|
struct sigaction act, oact;
|
|
|
|
act.sa_handler = func;
|
1999-10-05 04:54:07 +04:00
|
|
|
|
1998-08-08 10:46:01 +04:00
|
|
|
sigemptyset(&act.sa_mask);
|
1999-09-28 03:09:42 +04:00
|
|
|
#if defined(SA_RESTART) /* 4.4BSD, Posix(?), SVR4 */
|
1999-10-05 04:54:07 +04:00
|
|
|
act.sa_flags = restartable ? SA_RESTART : 0;
|
1999-09-28 03:09:42 +04:00
|
|
|
#elif defined(SA_INTERRUPT) /* SunOS 4.x */
|
1999-10-05 04:54:07 +04:00
|
|
|
act.sa_flags = restartable ? 0 : SA_INTERRUPT;
|
1999-09-28 03:09:42 +04:00
|
|
|
#else
|
|
|
|
#error "system must have SA_RESTART or SA_INTERRUPT"
|
|
|
|
#endif
|
1998-08-08 10:46:01 +04:00
|
|
|
if (sigaction(sig, &act, &oact) < 0)
|
|
|
|
return (SIG_ERR);
|
|
|
|
return (oact.sa_handler);
|
|
|
|
}
|
1999-10-05 04:54:07 +04:00
|
|
|
|
1999-10-13 06:47:54 +04:00
|
|
|
/*
|
|
|
|
* Install a signal handler with the `restartable' flag set dependent upon
|
|
|
|
* which signal is being set. (This is a wrapper to xsignal_restart())
|
|
|
|
*/
|
2000-02-01 01:01:03 +03:00
|
|
|
sigfunc
|
2000-05-01 14:35:16 +04:00
|
|
|
xsignal(int sig, sigfunc func)
|
1999-10-05 04:54:07 +04:00
|
|
|
{
|
|
|
|
int restartable;
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Some signals print output or change the state of the process.
|
|
|
|
* There should be restartable, so that reads and writes are
|
|
|
|
* not affected. Some signals should cause program flow to change;
|
|
|
|
* these signals should not be restartable, so that the system call
|
|
|
|
* will return with EINTR, and the program will go do something
|
1999-10-09 07:00:55 +04:00
|
|
|
* different. If the signal handler calls longjmp() or siglongjmp(),
|
|
|
|
* it doesn't matter if it's restartable.
|
1999-10-05 04:54:07 +04:00
|
|
|
*/
|
|
|
|
|
|
|
|
switch(sig) {
|
1999-10-05 17:05:39 +04:00
|
|
|
#ifdef SIGINFO
|
1999-10-05 04:54:07 +04:00
|
|
|
case SIGINFO:
|
1999-10-05 17:05:39 +04:00
|
|
|
#endif
|
|
|
|
case SIGQUIT:
|
1999-10-05 04:54:07 +04:00
|
|
|
case SIGUSR1:
|
|
|
|
case SIGUSR2:
|
|
|
|
case SIGWINCH:
|
|
|
|
restartable = 1;
|
|
|
|
break;
|
|
|
|
|
|
|
|
case SIGALRM:
|
|
|
|
case SIGINT:
|
|
|
|
case SIGPIPE:
|
|
|
|
restartable = 0;
|
|
|
|
break;
|
|
|
|
|
|
|
|
default:
|
|
|
|
/*
|
|
|
|
* This is unpleasant, but I don't know what would be better.
|
|
|
|
* Right now, this "can't happen"
|
|
|
|
*/
|
1999-10-24 16:31:36 +04:00
|
|
|
errx(1, "xsignal_restart called with signal %d", sig);
|
1999-10-05 04:54:07 +04:00
|
|
|
}
|
|
|
|
|
|
|
|
return(xsignal_restart(sig, func, restartable));
|
|
|
|
}
|