diff options
| author | ache <ache@FreeBSD.org> | 1995-03-09 17:40:56 +0000 |
|---|---|---|
| committer | ache <ache@FreeBSD.org> | 1995-03-09 17:40:56 +0000 |
| commit | b3bfdc6852f784617de43b243ae5afbfd3777745 (patch) | |
| tree | 54c889402557a85ca3a2736a8ca7f1d2f6d0bd0b /usr.bin | |
| parent | 1fcb4ac137589e2db04ef762213c77bc48271b4e (diff) | |
| download | FreeBSD-src-b3bfdc6852f784617de43b243ae5afbfd3777745.zip FreeBSD-src-b3bfdc6852f784617de43b243ae5afbfd3777745.tar.gz | |
Merge.
Diffstat (limited to 'usr.bin')
| -rw-r--r-- | usr.bin/ncftp/.cvsimport.sh | 6 | ||||
| -rw-r--r-- | usr.bin/ncftp/ftp.c | 13 | ||||
| -rw-r--r-- | usr.bin/ncftp/main.c | 2 | ||||
| -rw-r--r-- | usr.bin/ncftp/main.h | 5 | ||||
| -rw-r--r-- | usr.bin/ncftp/sys.h | 29 |
5 files changed, 46 insertions, 9 deletions
diff --git a/usr.bin/ncftp/.cvsimport.sh b/usr.bin/ncftp/.cvsimport.sh index d5702b3..bc86cfd 100644 --- a/usr.bin/ncftp/.cvsimport.sh +++ b/usr.bin/ncftp/.cvsimport.sh @@ -1,5 +1,5 @@ #!/bin/sh -tar zxvf ncftp-1.9.2.tgz -cd ncftp-1.9.2 +tar zxvf ncftp-1.9.3.tgz +cd ncftp-1.9.3 rm Makefile -cvs import src/usr.bin/ncftp mgleason ncftp_1_9_2 +cvs import src/usr.bin/ncftp mgleason ncftp_1_9_3 diff --git a/usr.bin/ncftp/ftp.c b/usr.bin/ncftp/ftp.c index 4cb8d8d..c90aafe 100644 --- a/usr.bin/ncftp/ftp.c +++ b/usr.bin/ncftp/ftp.c @@ -1737,6 +1737,19 @@ int initconn(void) rval = 1; goto Return; } +#ifdef LINGER /* If puts don't complete, you could try this. */ + { + struct linger li; + li.l_onoff = 1; + li.l_linger = 900; + + if (setsockopt(data, SOL_SOCKET, SO_LINGER, + (char *)&li, sizeof(struct linger)) < 0) + { + PERROR("initconn", "setsockopt(SO_LINGER)"); + } + } +#endif /* LINGER */ if (options & SO_DEBUG && setsockopt(data, SOL_SOCKET, SO_DEBUG, (char *)&on, sizeof(on)) < 0 ) { PERROR("initconn", "setscokopt (ignored)"); diff --git a/usr.bin/ncftp/main.c b/usr.bin/ncftp/main.c index d7aa1b8..c1b17b8 100644 --- a/usr.bin/ncftp/main.c +++ b/usr.bin/ncftp/main.c @@ -2,7 +2,7 @@ #define _main_c_ -#define FTP_VERSION "1.9.2 (January 20, 1995)" +#define FTP_VERSION "1.9.3 (March 5, 1995)" /* #define BETA 1 */ /* If defined, it prints a little warning message. */ diff --git a/usr.bin/ncftp/main.h b/usr.bin/ncftp/main.h index fd6438c..4e3bba6 100644 --- a/usr.bin/ncftp/main.h +++ b/usr.bin/ncftp/main.h @@ -3,11 +3,6 @@ #ifndef _main_h_ #define _main_h_ -/* $RCSfile: main.h,v $ - * $Revision: 14020.12 $ - * $Date: 93/05/21 05:45:33 $ - */ - struct userinfo { str32 username; string homedir; diff --git a/usr.bin/ncftp/sys.h b/usr.bin/ncftp/sys.h index e4b6d55..b42571a 100644 --- a/usr.bin/ncftp/sys.h +++ b/usr.bin/ncftp/sys.h @@ -328,8 +328,23 @@ extern int errno; # ifdef __alpha /* DEC OSF/1 */ # define GETCWDSIZET 1 # endif +# ifndef System +# define System "DEC OSF/1" +# endif #endif +#ifdef DELL +# ifndef System +# define System "DELL SVR4 Issue 2.2" +# endif +# ifndef HAS_DOMAINNAME +# define HAS_DOMAINNAME 1 +# endif +# ifndef LINGER +# define LINGER /* SVR4/386 Streams TCP/IP bug on close */ +# endif +#endif /* DELL */ + /* -------------------------------------------------------------------- */ #ifdef _SYSV @@ -412,6 +427,20 @@ extern int errno; # define NO_CONST 1 /* avoid prototype conflict */ #endif +#ifdef __NetBSD__ +# define System "NetBSD" +# define GZCAT "/usr/bin/zcat" +# define HERROR 1 +# define TERMIOS 1 +# define HAS_GETCWD 1 +# define HAS_DOMAINNAME 1 +# define U_WAIT 1 +# define GETCWDSIZET 1 +# define NO_CONST 1 /* avoid prototype conflict */ +# include <sys/types.h> +# include <sys/param.h> +#endif + #ifdef BSD # ifndef __FreeBSD__ # ifndef SYSDIRH |
