aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrey A. Chernov <ache@FreeBSD.org>1995-03-09 17:28:46 +0000
committerAndrey A. Chernov <ache@FreeBSD.org>1995-03-09 17:28:46 +0000
commit0e0d6a804239933f10ee0746fd97d09905f92e96 (patch)
tree86038c8f2f60767ac76f8d6fb5e7e7bbd327f615
parentb3e8cc7812a51644136c53e23f80ae66b569c760 (diff)
downloadsrc-0e0d6a804239933f10ee0746fd97d09905f92e96.tar.gz
src-0e0d6a804239933f10ee0746fd97d09905f92e96.zip
Notes
Notes: svn path=/vendor/ncftp/dist/; revision=6962 svn path=/vendor/ncftp/1.9.3/; revision=6964; tag=vendor/ncftp/1.9.3
-rw-r--r--usr.bin/ncftp/README6
-rw-r--r--usr.bin/ncftp/ftp.c13
-rw-r--r--usr.bin/ncftp/main.c2
-rw-r--r--usr.bin/ncftp/main.h5
-rw-r--r--usr.bin/ncftp/patchlevel.h3
-rw-r--r--usr.bin/ncftp/sys.h29
6 files changed, 50 insertions, 8 deletions
diff --git a/usr.bin/ncftp/README b/usr.bin/ncftp/README
index 961d56cc5755..d9c19914dda9 100644
--- a/usr.bin/ncftp/README
+++ b/usr.bin/ncftp/README
@@ -284,8 +284,10 @@ Add these as applicable to the PDEFS line in the Makefile.
* -DSOCKS: NcFTP is now compatible with the Socks library by David Koblas,
at koblas@sgi.com. This lets you use NcFTP with a "firewall" gateway
- for enhanced site security. You can get the latest version from
- netcom.com:/pub/koblas. After you have compiled it, compile NcFTP
+ for enhanced site security. You can get the latest version from...
+ ftp://ftp.netcom.com/pub/ko/koblas/
+
+ After you have compiled it, compile NcFTP
with -DSOCKS added to PDEFS, and the pathname of the Rconnect.o file
added to LIBS.
diff --git a/usr.bin/ncftp/ftp.c b/usr.bin/ncftp/ftp.c
index 4cb8d8de967c..c90aafeb69b8 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 d7aa1b8f154f..c1b17b810a2c 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 fd6438c38549..4e3bba68a14c 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/patchlevel.h b/usr.bin/ncftp/patchlevel.h
index ff9c90d18243..becd3c063574 100644
--- a/usr.bin/ncftp/patchlevel.h
+++ b/usr.bin/ncftp/patchlevel.h
@@ -1,3 +1,6 @@
+v1.9.3 - March 5, 1995. Support for NetBSD and DELL added. Linger works
+ with passive mode now.
+
v1.9.2 - January 20, 1995. Another passive mode fix with the SOCKS library.
Trying to avoid going into the interactive shell if colon-mode fails.
diff --git a/usr.bin/ncftp/sys.h b/usr.bin/ncftp/sys.h
index e4b6d55f8f0d..b42571a06d27 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