- Copy stable/10 (r259064) to releng/10.0 as part of the
10.0-RELEASE cycle.
- Update __FreeBSD_version [1]
- Set branch name to -RC1

[1] 10.0-CURRENT __FreeBSD_version value ended at '55', so
start releng/10.0 at '100' so the branch is started with
a value ending in zero.

Approved by: re (implicit)
Sponsored by: The FreeBSD Foundation

Copy head (r256279) to stable/10 as part of the 10.0-RELEASE cycle.

Approved by: re (implicit)
Sponsored by: The FreeBSD Foundation

Merge tnftp-20100108 from the vendor branch into head.

PR: bin/112288 bin/120256 bin/129014 bin/145528
MFC after: 1 month

Build usr.bin/ with WARNS=6 by default.

Also add some missing $FreeBSD$ to keep svn happy.

Obey MK_INET6_SUPPORT.

Fixed style of DPADD and LDADD assignments as per style.Makefile(5).

Restore INET6 option from config.h.

Submitted by: David Malone <dwmalone@maths.tcd.ie>

Update for latest lukemftp import.

Update for lukemftp-1.6-beta2.

Connect lukemftp to the build as the default ftp client. Lukemftp
supports most of the previous features of FreeBSD ftp, but has been
better maintained and includes new features.

Make completion work with filenames containing spaces.

PR: bin/23526
Submitted by: root@yoda.fwe.pi.musin.de
MFC after: 1 week

Adjust to the libedit enhancements some functions now take more parameters.

Partially submitted by: kris

strtol -> strtoll (for off_t file size)

File positions are off_t nowdays, not long, so:
long -> off_t
fseek -> fseeko

NOTE: that fseek not works for >long offsets files per POSIX:

[EOVERFLOW] For fseek( ), the resulting file offset would be a value which
cannot be represented correctly in an object of type long.

Revert the previous delta and apply a better fix which corrects
a check on the final snprintf and reduces duplicated code.

Submitted by: brian

Remove whitespace at end of line I happened to find during my last edit.

Add support for proper URI encoding, using strvisx(3)'s VIS_HTTPSTYLE.

Requests through a proxy are still broken for URIs that contain
blanks, since this required a bigger rewrite of the whole function.

Add support for HTTP/1.1 name-based virtual hosts. Also, use
asprintf(3) when creating the request string, as the length of
a path is defined as unlimited by the standard and limiting the
total request to 4K is awfully arbitrary.

PR: 30054
Submitted by: Joseph Mallett <jmallett@xMach.org>
MFC after: 8 days

o Fix some checks on snprintf(3) to prevent miscalculations.
o This fixes a memory leak that can occur on some URL's.

Pointy hat to: brian

Fix my previous snprintf() patches (which were largely no-ops).

Mostly submitted by: bde

Display a better error message when snprintf() returns < 0

Pointed out by: bde

Handle overflows from snprintf(), not just returns of < 0

Pointed out by: bde

Handle snprintf() returning -1.

MFC after: 2 weeks

Removed duplicate VCS ID tags, as per style(9).

mdoc(7) police: protect trailing full stops of abbreviations
with a trailing zero-width space: `e.g.\&'.

Fix using /usr/bin/ftp as a slave process on the end of a pipe by calling
fflush(stdout). This is one ancient PR...

PR: bin/1589
Submitted by: imp

Portability configuation for LukeM's ftp client.

Remove whitespace at EOL.

mdoc(7) police: removed HISTORY info from the .Os call.

Correct small typo on debug message.

PR: bin/28337
Submitted by: Koga Youichirou <y-koga@jp.freebsd.org>
MFC after: 1 week

Fixed a null pointer bug in rev.1.10. Rev.1.10 was supposed to to
move the "for safety" zeroing of unused members of timebuf to a better
place. It actually moved the zeroing to a worse place and didn't add
necessary braces.

Fixed a nearby older bug. timebuf.tm_gmtoff was sometimes used even
when timebuf was invalid. Even when it is zeroed, a failing mktime()
might set it to nonzero.

PR: 25243

Prepare for mdoc(7)NG.

mdoc(7) police: use the new features of the Nm macro.

Don't depend on <sys/stat.h> bogusly including <sys/time.h> (and thereby
<time.h>).

Do not call freeaddrinfo(res0) twice.

PR: bin/21476

optarg and optind are declared in unistd.h.
h_error is declared in netdb.h

"ls" is note the same as "nlist", but it is the same as "dir". Correct
this, and add a bit to the descriptions of "dir" and "nlist" to emphasize
the difference.

PR: 15408
Submitted by: Joe Smith <inwap@best.com>

- Reflect `gateport' variable type change.
- Make it compile with -Wall.

PR: 18619
Submitted by: David Malone <dwmalone@maths.tcd.ie>
Reviewed by: ru

Get rid of segfault in a `site %s' case.

Submitted by: Max Khon <fjoe@iclub.nsu.ru>

Fix obvious cut-n-paste error.

Submitted by: Thomas Ludwig <tludwig@urbanet.ch>

Make sure to use native IPv4 addrerss even if getaddrinfo()
returns IPv4 mapped IPv6 address. FTP is nervous about address
family.
Submitted by itojun and slightly modified to fit our ftp(1).

Mention about -4 and -6 options.

Don't pass scope-id to EPRT command.

Reviewed by: sumikawa

Replace isurl() with isipv6addr().

Reported by: Koji Kondo <koji@jp.above.net>
Obtained from: NetBSD

Remove addition of -g to CFLAGS

Fix whitepace in the arguments of two Xr macros.

ftp(1)'s default pager is "more", not "less", as documented.

PR: docs/17099
Submitted by: Udo Erdelhoff <ue@nathan.ruhr.de>

Previous fix was incomplete and has problem in reverse lookup failed dest,
so fix it.

Approved by: jkh

Submitted by: Ian West <ian@niw.com.au>

Correctly print out "Connected to" hostname.
Temporal buffer was used for the hostname and freed before actually used.

Specified by: ru
Approved by: jkh

Fix several problems with EPSV (verbosity, one-per-session, missing place)

Approved by: jkh

Removed bogus line.

Specified by: ache
Approved by: jkh

Don't try EPSV once it failed.

Specified by: Andrey A. Chernov" <ache@nagual.pp.ru>
Approved by: jkh

Add -4 and -6 options.

Current getaddrinfo() implemetation has a problem of too much resolving
waiting time on INET6 enabled systems.
-4 and -6 options can limit name resolving address family and is a possible
workaround for the problem.

Approved by: jkh

Add more dual stack consideration.

-Should retry as much as possible when dest addr and
source addr(specified with -s option) address family
missmatch happend

Approved by: jkh

Fix parsing problems.

-"ftp hostname:/path" was not working.
- IPv6 raw addr specification was not well supported, such as,
"ftp http://\[1:2:3:4:5:6:7:8:\]/index.html"

Approved by: jkh

Fix several bogus bugs

-Some address resolving related structures were not freed after use.
-Some error messages were not printed out correctly.

Approved by: jkh

Let ftp command use only PORT(no EPRT) for IPv4 destination.
Because if ftpd is invoked with -R option, and EPRT is used via firewal
or NAT which don't understand EPRT, then the data connection from ftpd
to ftp client will fail.

Reported By: ume@mahoroba.org
Approved by: jkh

another tcp apps IPv6 updates.(should be make world safe)
ftp, telnet, ftpd, faithd
also telnet related sync with crypto, secure, kerberosIV

Obtained from: KAME project

Revert the change from memset() to bzero(), since bzero() is simply
a special case of memset and we already initialize all those
members of the struct tm which are required by mktime().

The memset() is only necessary for style conformity with the rest
of the file. :-)

Scenic route tour by: bde

Correctly parse broken MDTM responses from servers which format
tm_year with "19%02d".

PR: 15981
Reported by: klh@netcom.com (Ken Harrenstien)
Reviewed by: bde

Remove all \n from __COPYRIGHT(...) string - assembler can't parse them
in .ident and produce warning

$Id$ -> $FreeBSD$

Clean up some ambiguous nested if/elses.

Reverse the FTP_PASSIVE_MODE check, so it checks for "is not NO" rather
than "is YES".

Document that FTP_PASSIVE_MODE should be explicitly
set to `YES' for passive mode to be used by default.
Just setting FTP_PASSIVE_MODE is not sufficient, as
it was before.

Noted by: eivind
Reviewed by: des

retreived -> retrieved

Obtained from: OpenBSD

- add "-s src_addr" option to allow setting of the source IP address;
- fix two minor bugs;
- slightly cleanup manpage.

Separate the pftp and FTP_PASSIVE_MODE tests so gate mode works again.

PR: bin/12070
Submitted by: Dominic Mitchell <Dom.Mitchell@palmerharvey.co.uk>

Specifically check that FTP_PASSIVE_MODE is set to YES, rather than
just checking if it is defined.

Discussed on: freebsd-current

Better error checking.

fd_set is documented to be a typedef, not a struct. Conform more
closely to the documented interface.

Inspired-by: similar changes in OpenBSD

'remaining' must be declared off_t instead of int to avoid FPE when the size of
the file to transfer is very large (577985293894855484 bytes in the case I
encountered, but this was a buggy ftp server :-))

Don't assume that hp->h_lenght == 4. Be conservative in its use.
Submitted by: J. Assange a long time ago.

Fix a few minor typos and style nits.

PR: 5883
Submitted by: hnokubi@yyy.or.jp

Cleanup code so that long lines to be quoted don't get truncated.

PR: 5679
Reviewed by: Bruce Evans <bde@zeta.org.au>

Don't print garbage when user enters EOF at name prompt.
PR: 5565
Submitted by: Jens Schweikhardt

Revert to previous behaviour, only generate NLST for explicit "nlist"
command.
Submitted by: wollman

One more ctype cast

Add more (unsigned char) casts to ctype macros

Add (unsigned char) cast to ctype macro

Sync with NetBSD v1.3.

Keep I8N1 and quarantine port code. Replace our security fix with NetBSD's
(their idea was better).

Mention pftp as an alternative command to enable passive mode.

Style fix.
Complaint by: Bruce

Make sure you do not get unexpected surprises whena remote file starts with '|'.
Reviewed by: Joerg Wunsch

Changes to support full make parallelism (-j<n>) in the world
target.
Reviewed by: <many different folks>
Submitted by: Nickolay N. Dudorov" <nnd@nnd.itfs.nsk.su>

- Changed default PAGER from 'less' to 'more', since we don't have less
in the base system.

PR: bin/4471
Submitted by: Dmitry Khrustalev <dima@xyzzy.machaon.ru>

Replace hand-made tolower conversions with real tolower from ctype

Protect isspace by isascii to not count high spaces

Activate collate to sort local files properly for completion

Localize it (ctype)
8bit ctype clean fixes
(I can't input 8bit chars otherwise in this new ftp, it beeps)

Import substantial improvements to ftp(1) from NetBSD, largely the
work of Luke Mewburn.

This includes, but is not limited to :

- commandline editing and history.
- local and remote filename completion.
- a new progress display.
- the ability to access files using either the ftp or http protocols,
and use http proxies for ftp transfers.

The FreeeBSD "restricted ports" functionality was preserved.

Obtained from: NetBSD

Meg -> Mbytes

PR: 3829
Submitted by: Josh Gilliam <josh@quick.net>

compare return value from getopt against -1 rather than EOF, per the final
posix standard on the topic.

Buffer overflow from Keith Bostic.
Obtained from: BSDi by way of Keith Bostic

Fix problem in ftp and case mapping mode where the converted string wasn't
terminated properly. Fix is from the PR and works for the test cases I
threw at it. Should be safe and desirable for back porting to 2.2 or
earlier if there are people still comitting to -stable.

Submitted by: Marc Slemko <marcs@znep.com>
Closes PR: 1864

Apply a long-forgotten change to make FTP_PASSIVE_MODE just that
much more universal (in FreeBSD, anyway) in taking some of the pain
out of firewalls.

Make "ftp" a synonym for "open"

Fix a couple of file-descriptor leaks.

1. Remove SOCKS support (unneded with SOCKS v5 port)
2. Update quarantine port support to use new kernel mechanism.

Changed printf for reporting transfer stats from using %.2g to %.2f to
get rid of "scientific notation" reporting (PR#bin/329)

Added a switch so that if bytes/sec > 1Meg/sec, report in Meg/sec instead
of Kbytes/sec

Add support for socks

Fix a bunch of spelling errors in a bunch of man pages.

Use data ports in the range 40000..44999 by default to enhance FTP usability
in a firewall environment. Original idea by Mark Tracy (?).

Reviewed by: wollman
Submitted by: pst

Remove trailing whitespace.

Use port 21 as default if getservbyname fails to find it for us. This let
us remove some crud from the install-procedure.

Fix checking of directory access for "/foo". The parent directory is
"/", not "".

Add -p flag and pftp alias for passive ftp

Declare fuction setpassive in file cmds.c void and update corresponding
prototype declaration in extern.h.

Kludge to workaround ftp coredumping when password is specified before
login in .netrc.

Submitted by: John Kohl

Add support for passive mode FTP (default off) to base FTP client to support
users behind packet filtering firewalls.
Obtained from: David Carrel <carrel@cisco.com>

Fixed stupid bug which prevented any command line options from being
understood.

Submitted by: Uwe Arndt (arndt@mailhost.uni-koblenz.de)

This commit was generated by cvs2svn to compensate for changes in r1590,
which included commits to RCS files with non-trunk default branches.