Merge.

4 files changed, 45 insertions, 38 deletions

diff --git a/usr.bin/ncftp/.cvsimport.sh b/usr.bin/ncftp/.cvsimport.sh
index bc86cfd..b053415 100644
--- a/usr.bin/ncftp/.cvsimport.sh
+++ b/usr.bin/ncftp/.cvsimport.sh
@@ -1,5 +1,5 @@
 #!/bin/sh
-tar zxvf ncftp-1.9.3.tgz
-cd ncftp-1.9.3
+tar zxvf ncftp-1.9.4.tgz
+cd ncftp-1.9.4
 rm Makefile
-cvs import src/usr.bin/ncftp mgleason ncftp_1_9_3
+cvs import src/usr.bin/ncftp mgleason ncftp_1_9_4
diff --git a/usr.bin/ncftp/defaults.h b/usr.bin/ncftp/defaults.h
index 5ce5778..18331ea 100644
--- a/usr.bin/ncftp/defaults.h
+++ b/usr.bin/ncftp/defaults.h
@@ -49,7 +49,7 @@
  * Port ftp by default.
  */
 #ifndef	dPASSIVE
-#define	dPASSIVE 1				/* Works for most folks... */
+#define	dPASSIVE 0				/* Use PORT for more portability... */
 #endif
 
 #ifndef dVERBOSE				/* V_QUIET, V_ERRS, V_TERSE, V_VERBOSE */
diff --git a/usr.bin/ncftp/main.c b/usr.bin/ncftp/main.c
index 49adfa7..68d9da7 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.3 (March 5, 1995)"
+#define FTP_VERSION "1.9.4 (April 15, 1995)"
 
 /* #define BETA 1 */ /* If defined, it prints a little warning message. */
 
@@ -460,28 +460,32 @@ int getuserinfo(void)
 		else
 			(void) Strncpy(uinfo.homedir, pw->pw_dir);
 		cp = getenv("MAIL");
-#ifndef __FreeBSD__
-		if (cp == NULL)
-			cp = getenv("mail");
-		if (cp == NULL)
-			(void) sprintf(str, "/usr/spool/mail/%s", uinfo.username);
-#else
-		if (cp == NULL)
-			(void) sprintf(str, "/var/mail/%s", uinfo.username);
-#endif
-		else
+		if (cp != NULL) {
 			(void) Strncpy(str, cp);
+		} else {
+			/* Check a few typical mail directories.
+			 * If we don't find it, too bad.  Checking for new mail
+			 * isn't very important anyway.
+			 */
+			(void) sprintf(str, "/usr/spool/mail/%s", uinfo.username);
+			if (access(str, 0) < 0) {
+				(void) sprintf(str, "/var/mail/%s", uinfo.username);
+			}
+		}
 		cp = str;
-
-		/*
-		 * mbox variable may be like MAIL=(28 /usr/mail/me /usr/mail/you),
-		 * so try to find the first mail path.
-		 */
-		while ((*cp != '/') && (*cp != 0))
-			cp++;
-		(void) Strncpy(mail_path, cp);
-		if ((cp = index(mail_path, ' ')) != NULL)
-			*cp = '\0';
+		if (access(cp, 0) < 0) {
+			mail_path[0] = 0;
+		} else {
+			/*
+			 * mbox variable may be like MAIL=(28 /usr/mail/me /usr/mail/you),
+			 * so try to find the first mail path.
+			 */
+			while ((*cp != '/') && (*cp != 0))
+				cp++;
+			(void) Strncpy(mail_path, cp);
+			if ((cp = index(mail_path, ' ')) != NULL)
+				*cp = '\0';
+		}
 		return (0);
 	} else {
 		PERROR("getuserinfo", "Could not get your passwd entry!");
diff --git a/usr.bin/ncftp/ncftp.1 b/usr.bin/ncftp/ncftp.1
index e23a1ba..67ff6e2 100644
--- a/usr.bin/ncftp/ncftp.1
+++ b/usr.bin/ncftp/ncftp.1
@@ -60,7 +60,7 @@
 .fi
 .in
 ..
-.TH NcFTP 1 "" NCEMRSoft
+.TH NcFTP 1 "1.9" NCEMRSoft
 .\"-------
 .SH "NAME"
 .\"-------
@@ -281,7 +281,7 @@ machine wuarchive.wustl.edu
 Then you could put in your username, password, and account if you like:
 .Ds
 user anonymous
-password \-mgleason@cse.unl.edu
+password \-mgleason@ftp.cs.unl.edu
 account wuarc.does.not.use.accounts
 .De
 .PP
@@ -306,7 +306,7 @@ I recommend you adhere to this format:
 .Ds
 machine wuarchive.wustl.edu
 	user anonymous
-	password \-mgleason@cse.unl.edu
+	password \-mgleason@ftp.cs.unl.edu
 	account wuarc.does.not.use.accounts
 	macdef init
 		cd /graphics/gif
@@ -1085,7 +1085,7 @@ facility.
 If you wanted to know the site's IP number, but only knew the name you
 could do:
 .Ds
-lookup cse.unl.edu
+lookup ftp.cs.unl.edu
 .De
 .PP
 This would spit out IP number for that site, in this case ``129.93.1.12''.
@@ -1095,7 +1095,7 @@ try:
 lookup 129.93.1.12
 .De
 .PP
-This would spit out the name for that site, in this case ``cse.unl.edu''.
+This would spit out the name for that site, in this case ``ftp.cs.unl.edu''.
 .\"-------
 .SH "Checking the configuration of the program"
 .\"-------
@@ -1177,10 +1177,10 @@ inserts the host and current
 directory path in
 .I "colon-mode"
 format, such as
-``cse.unl.edu:/pub/mgleason'', or ``(not connected)''.
+``ftp.cs.unl.edu:/pub/mgleason'', or ``(not connected)''.
 The
 .B @c
-flag is similar, only it will insert ``cse.unl.edu:/pub/mgleason'' and a
+flag is similar, only it will insert ``ftp.cs.unl.edu:/pub/mgleason'' and a
 newline if connected, otherwise it prints nothing.
 The default prompt uses
 this flag to print a two line prompt when connected and a one line prompt
@@ -1294,13 +1294,13 @@ This fetches
 .B CONTENTS
 and then quits:
 .Ds
-csh> ncftp cse.unl.edu:/pub/mgleason/CONTENTS
+csh> ncftp ftp.cs.unl.edu:/pub/mgleason/CONTENTS
 .De
 .PP
 Some others examples, with open options and main program options mixed in:
 .Ds
 csh> ncftp \-V quiet \-u ftp.unl.edu
-csh> ncftp \-c cse.unl.edu:/pub/mgleason/CONTENTS
+csh> ncftp \-c ftp.cs.unl.edu:/pub/mgleason/CONTENTS
 csh> ncftp \-D 2 \-r \-d 120 \-g 10 \-N ftp.unl.edu
 .De
 .\"-------
@@ -1326,7 +1326,7 @@ machine sumex\-aim.stanford.edu
 machine ftp.apple.com
 .sp
 # NcFTP will only ask for your password:
-machine cse.unl.edu
+machine ftp.cs.unl.edu
 	login mgleason
 .sp
 # You can supply a login and a password:
@@ -1359,13 +1359,16 @@ is copyrighted 1992, 1993 by NCEMRSoft
 and 1985, 1989 by the Regents of California.
 .PP
 Ideas and some code contributed by Phil Dietz,
-.I NCEMRSoft
-(pdietz@cse.unl.edu).
+.IR NCEMRSoft "."
 Testing and debugging done by Phil and
-Kok Hon Yin (hkok@cse.unl.edu).
+Kok Hon Yin
 .PP
 Extensive man page formatting work
 by DaviD W. Sanderson (dws@ssec.wisc.edu).
+.PP
+As of this writing, the most recent version is archived in
+/pub/ncftp, on
+.IR "ftp.cs.unl.edu" "."
 .\"-------
 .SH "BUGS"
 .\"-------