diff options
| author | ache <ache@FreeBSD.org> | 1994-11-04 05:36:00 +0000 |
|---|---|---|
| committer | ache <ache@FreeBSD.org> | 1994-11-04 05:36:00 +0000 |
| commit | e4ff209da90b097620cd3e7d66fb01b19c6e5418 (patch) | |
| tree | 9795aebff85d5767411af5cfb473ce8ee987124d /usr.bin | |
| parent | 41cb9decc65e51e29f0eb6fe06bcb3594726bd6b (diff) | |
| download | FreeBSD-src-e4ff209da90b097620cd3e7d66fb01b19c6e5418.zip FreeBSD-src-e4ff209da90b097620cd3e7d66fb01b19c6e5418.tar.gz | |
Initial import 1.8.6
Diffstat (limited to 'usr.bin')
| -rw-r--r-- | usr.bin/ncftp/cmds.c | 3 | ||||
| -rw-r--r-- | usr.bin/ncftp/ftp.c | 2 | ||||
| -rw-r--r-- | usr.bin/ncftp/main.c | 2 | ||||
| -rw-r--r-- | usr.bin/ncftp/patchlevel.h | 4 | ||||
| -rw-r--r-- | usr.bin/ncftp/sys.h | 7 |
5 files changed, 10 insertions, 8 deletions
diff --git a/usr.bin/ncftp/cmds.c b/usr.bin/ncftp/cmds.c index 41394db..c19cf0c 100644 --- a/usr.bin/ncftp/cmds.c +++ b/usr.bin/ncftp/cmds.c @@ -1798,7 +1798,8 @@ to be the full name of your hostname.\n"); * the domain to the machine to get a full hostname. */ if (domain[0]) { - (void) _Strncat(host, ".", size); + if (domain[0] != '.') + (void) _Strncat(host, ".", size); (void) _Strncat(host, domain, size); } else { fprintf(stderr, diff --git a/usr.bin/ncftp/ftp.c b/usr.bin/ncftp/ftp.c index 71f7abe..fe35d1a 100644 --- a/usr.bin/ncftp/ftp.c +++ b/usr.bin/ncftp/ftp.c @@ -189,7 +189,7 @@ int hookup(char *host, unsigned int port) continue; } } - PERROR("hookup", "connect"); + PERROR("hookup", host); switch (errno) { case ENETDOWN: case ENETUNREACH: diff --git a/usr.bin/ncftp/main.c b/usr.bin/ncftp/main.c index 446c1c3..d51d384 100644 --- a/usr.bin/ncftp/main.c +++ b/usr.bin/ncftp/main.c @@ -7,7 +7,7 @@ #define _main_c_ -#define FTP_VERSION "1.8.5 (September 20, 1994)" +#define FTP_VERSION "1.8.6 (Octboer 30, 1994)" /* #define BETA 1 */ /* If defined, it prints a little warning message. */ diff --git a/usr.bin/ncftp/patchlevel.h b/usr.bin/ncftp/patchlevel.h index 99690ee..60d128a 100644 --- a/usr.bin/ncftp/patchlevel.h +++ b/usr.bin/ncftp/patchlevel.h @@ -1,4 +1,6 @@ -v1.8.5 - September 20, 1994. Better support for term. +v1.8.6 - October 30, 1994. Tweaks for Solaris in sys.h. + +v1.8.5 - September 20, 1994. Better(?) support for term. v1.8.4 - September 19, 1994. Bug in Makefile fixed. Bug involving getwd fixed. diff --git a/usr.bin/ncftp/sys.h b/usr.bin/ncftp/sys.h index 699432f..372640c 100644 --- a/usr.bin/ncftp/sys.h +++ b/usr.bin/ncftp/sys.h @@ -22,10 +22,10 @@ ^^^ "You need to use an ANSI C compiler. Try using gcc or acc." ^^^ # endif # ifdef Solaris /* not predefined. */ -# define SYSV 1 +# ifndef SYSV +# define SYSV 1 +# endif # define System "Solaris" -# undef __STDC__ -# define __STDC__ 0 # else # define System "SunOS" # ifndef RINDEX @@ -308,7 +308,6 @@ extern int errno; # ifndef BSD # define BSD 43 # endif -# define SIG_PARAMS (int sig, ...) # define NO_UTIMEH 1 # define System "Apollo" #endif |
