Import of 1.9.5, one my fix included to mainstream

6 files changed, 27 insertions, 7 deletions

diff --git a/usr.bin/ncftp/README b/usr.bin/ncftp/README
index 67a6610..098d2be 100644
--- a/usr.bin/ncftp/README
+++ b/usr.bin/ncftp/README
@@ -1,5 +1,5 @@
 Note:  This version is no longer being enhanced.  As of this writing, version
-2.0 is the officially supported version.  Only bug fixes and portability
+2.x is the officially supported version.  Only bug fixes and portability
 tweaks will be applied to the 1.9 series.
 
 If you are a novice user, and don't know how to compile things, try
diff --git a/usr.bin/ncftp/main.c b/usr.bin/ncftp/main.c
index 68d9da7..9401b78 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.4 (April 15, 1995)"
+#define FTP_VERSION "1.9.5 (October 29, 1995)"
 
 /* #define BETA 1 */ /* If defined, it prints a little warning message. */
 
@@ -29,6 +29,10 @@
 #	endif
 #endif	/* CURSES */
 
+#if defined(CURSES) && defined(SGTTYB)
+#       include <sgtty.h>
+#endif
+
 #include "util.h"
 #include "cmds.h"
 #include "main.h"
@@ -1104,6 +1108,10 @@ int termcap_get(char **dest, char *attr)
 void termcap_init(void)
 {
 	char *term;
+#ifdef  SGTTYB
+	struct sgttyb ttyb;
+	extern short ospeed;
+#endif
 
 	if ((term = getenv("TERM")) == NULL) {
 		term = "dumb";  /* TAR */
@@ -1123,6 +1131,10 @@ void termcap_init(void)
 		tcl_bold = strlen(tcap_boldface);
 		tcl_uline = strlen(tcap_underline);
 		tcl_rev = strlen(tcap_reverse);
+#ifdef  SGTTYB
+		if (ioctl(fileno(stdout), TIOCGETP, &ttyb) == 0)
+			ospeed = ttyb.sg_ospeed;
+#endif
 	}
 
 }	/* termcap_init */
diff --git a/usr.bin/ncftp/ncftp.1 b/usr.bin/ncftp/ncftp.1
index 695bec0..b36e0e5 100644
--- a/usr.bin/ncftp/ncftp.1
+++ b/usr.bin/ncftp/ncftp.1
@@ -406,8 +406,8 @@ flag sets a limit on how many dials
 should be attempting before giving up.
 If you don't supply
 .B \-g
-the program will dial a day and forever (which my Number Theory professor,
-Dr. Mientka, says is longer than forever and a day)
+the program will dial a forever and a day (which Ian K. Piumarta, and my Number Theory professor,
+Dr. Mientka, say is longer than a day and forever)
 until it connects successfully, or until you get sick of waiting and hit the
 interrupt key (usually ^C).
 .PP
@@ -1366,6 +1366,9 @@ Kok Hon Yin
 Extensive man page formatting work
 by DaviD W. Sanderson (dws@ssec.wisc.edu).
 .PP
+This version of the program is obselete and no longer supported.
+Ask your system administrator to upgrade to version 2.2 or newer.
+.PP
 As of this writing, the most recent version is archived in
 /pub/ncftp, on
 .IR "ftp.cs.unl.edu" "."
diff --git a/usr.bin/ncftp/patchlevel.h b/usr.bin/ncftp/patchlevel.h
index 377ae9c..4b7efc3 100644
--- a/usr.bin/ncftp/patchlevel.h
+++ b/usr.bin/ncftp/patchlevel.h
@@ -1,3 +1,5 @@
+v1.9.5 - October 29, 1995.  Termcap needs ospeed initialization for BSD.
+
 v1.9.4 - April 15, 1995.  Using PORT by default instead of PASV by default.
   Method to get the mail pathname changed.
 
diff --git a/usr.bin/ncftp/sys.h b/usr.bin/ncftp/sys.h
index b42571a..9b37427 100644
--- a/usr.bin/ncftp/sys.h
+++ b/usr.bin/ncftp/sys.h
@@ -446,9 +446,9 @@ extern int errno;
 #		ifndef SYSDIRH
 #			define SYSDIRH 1
 #		endif
-#		ifndef SGTTYB
-#			define SGTTYB
-#		endif
+#	endif
+#	ifndef SGTTYB
+#		define SGTTYB 1
 #	endif
 #endif
 
diff --git a/usr.bin/ncftp/tips.c b/usr.bin/ncftp/tips.c
index 30330b6..0b51a26 100644
--- a/usr.bin/ncftp/tips.c
+++ b/usr.bin/ncftp/tips.c
@@ -20,6 +20,9 @@
 static char *tiplist[] = {
     "Have you tried typing 'open' by itself lately?",
 
+    "You know what?  You're using obselete software.  Ask your sysadmin \n\
+	 to upgrade to a version of ncftp numbered 2.2 or higher.",
+
     "If you don't want a .ncrecent file in your home directory, put the \n\
      command '#unset recent-list' in your .ncftprc file.",