This commit was generated by cvs2svn to compensate for changes in r5216,

which included commits to RCS files with non-trunk default branches.

3 files changed, 20 insertions, 7 deletions

diff --git a/usr.bin/ncftp/patchlevel.h b/usr.bin/ncftp/patchlevel.h
index 3b2259f..2860040 100644
--- a/usr.bin/ncftp/patchlevel.h
+++ b/usr.bin/ncftp/patchlevel.h
@@ -1,6 +1,18 @@
+v1.9.0 - December 22, 1994.  The program won't exit from the interactive shell
+  if it's working from a tty.  For example, it won't exit if you do an mget
+  on a pattern that won't match anything.  Added padding around jmp_buf's
+  for SunOS.  SunOS needs sigjmp_buf's, but plenty of OS's don't support
+  sigjmp_buf's yet.  Fixed the tips to reflect the new archive site.
+
+v1.8.9 - December 20, 1994.  Can now set "passive" user variable, or use
+  passive command to toggle PASV/PORT ftp.  Debug mode now prints remote
+  responses.  Can now get around buggy FTP servers like boombox.micro.umn.edu,
+  that give back invalid port numbers to PASV.
+
+v1.8.8 - December 19, 1994.  Now falls back to port FTP if passive FTP fails.
+
 v1.8.7 - December 11, 1994.  Tweaks for FreeBSD.  Passive mode enabled and
-  turned on by default.  This should be the last version of ncftp before
-  version 2.
+  turned on by default.
 
 v1.8.6 - October 30, 1994.  Tweaks for Solaris in sys.h.
 
diff --git a/usr.bin/ncftp/set.c b/usr.bin/ncftp/set.c
index 14d8715..b071df2 100644
--- a/usr.bin/ncftp/set.c
+++ b/usr.bin/ncftp/set.c
@@ -47,7 +47,7 @@ extern FILE					*logf;
 extern longstring			rcname, logfname, lcwd;
 extern int					auto_binary, ansi_escapes, debug;
 extern int					mprompt, remote_is_unix, verbose;
-extern int					startup_msg, anon_open;
+extern int					startup_msg, anon_open, passivemode;
 #ifndef NO_TIPS
 extern int					tips;
 #endif
@@ -77,6 +77,7 @@ struct var vars[] = {
 	VARENTRY("logsize",			LONG, 0, &logsize,		NULL),
 	VARENTRY("mprompt",			BOOL, 0, &mprompt,		NULL),
 	VARENTRY("netrc",			-STR, 0, rcname,		NULL),
+	VARENTRY("passive",			BOOL, 0, &passivemode,	NULL),
 	VARENTRY("pager",			STR,  0, pager + 1,		set_pager),
 	VARENTRY("prompt",			STR,  0, prompt,		set_prompt),
 	VARENTRY("progress-reports",INT,  0, &progress_meter,NULL),
diff --git a/usr.bin/ncftp/tips.c b/usr.bin/ncftp/tips.c
index 5f72671..30330b6 100644
--- a/usr.bin/ncftp/tips.c
+++ b/usr.bin/ncftp/tips.c
@@ -89,8 +89,8 @@ static char *tiplist[] = {
      and/or use EMACS-style (or maybe VI-style) commands to edit the line.",
 #endif
 
-    "You can get the newest version of NcFTP from cse.unl.edu, in the\n\
-     /pub/mgleason/ncftp directory, AFTER business hours.",
+    "You can get the newest version of NcFTP from ftp.cs.unl.edu, in the\n\
+     /pub/ncftp directory, AFTER business hours.",
 
     "The type of progress-meter that will be used depends if the remote host\n\
      supports the SIZE command, and whether your terminal is capable of ANSI\n\
@@ -105,8 +105,8 @@ static char *tiplist[] = {
      the rc file, while still letting you use sitename abbreviations.",
 
     "You can use World Wide Web style paths instead of colon-mode paths.\n\
-     For example, if the colon-mode path was 'cse.unl.edu:pub/mgleason/ncftp',\n\
-     the WWW-style path would be 'ftp://cse.unl.edu/pub/mgleason/ncftp'.",
+     For example, if the colon-mode path was 'ftp.cs.unl.edu:pub/ncftp',\n\
+     the WWW-style path would be 'ftp://ftp.cs.unl.edu/pub/ncftp'.",
 
     "Sick and tired of these tips?  Put '#unset tips' in your .ncftprc."
 };