diff options
| author | ache <ache@FreeBSD.org> | 1994-11-04 06:11:39 +0000 |
|---|---|---|
| committer | ache <ache@FreeBSD.org> | 1994-11-04 06:11:39 +0000 |
| commit | a990c7e2831943a141ce695e5bb4aea2d33f6fed (patch) | |
| tree | e9ba6abc4442a17e4b7e1bcf1ef95c8878b344d3 /usr.bin | |
| parent | 4db77228e547f5508e488faea409e9d3592a1d23 (diff) | |
| download | FreeBSD-src-a990c7e2831943a141ce695e5bb4aea2d33f6fed.zip FreeBSD-src-a990c7e2831943a141ce695e5bb4aea2d33f6fed.tar.gz | |
Merge changes with new version
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/sys.h | 7 |
4 files changed, 7 insertions, 7 deletions
diff --git a/usr.bin/ncftp/cmds.c b/usr.bin/ncftp/cmds.c index 8b82152..d968467 100644 --- a/usr.bin/ncftp/cmds.c +++ b/usr.bin/ncftp/cmds.c @@ -1812,7 +1812,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 12832a0..c2ab933 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 (October 30, 1994)" /* #define BETA 1 */ /* If defined, it prints a little warning message. */ diff --git a/usr.bin/ncftp/sys.h b/usr.bin/ncftp/sys.h index dde7c43..2e7b5d2 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 |
