[src/netbsd-1-5]: src/usr.sbin/pkg_install/lib Pull up rev. 1.25 up to netbsd...

[hubertf <hubertf%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/a287572f709e
branches:  netbsd-1-5
changeset: 489613:a287572f709e
user:      hubertf <hubertf%NetBSD.org@localhost>
date:      Sun Oct 01 22:38:41 2000 +0000

description:
Pull up rev. 1.25 up to netbsd-1-5 branch, OK'd by thorpej:
 > Not every FTP server says nicely "Goodbye".
 > If they used some other string, pkg_add would hang forever.
 > The result of testing things only against one FTP server...

diffstat:

 usr.sbin/pkg_install/lib/ftpio.c |  6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diffs (23 lines):

diff -r b371297ddd61 -r a287572f709e usr.sbin/pkg_install/lib/ftpio.c
--- a/usr.sbin/pkg_install/lib/ftpio.c  Sun Oct 01 22:32:15 2000 +0000
+++ b/usr.sbin/pkg_install/lib/ftpio.c  Sun Oct 01 22:38:41 2000 +0000
@@ -1,8 +1,8 @@
-/*     $NetBSD: ftpio.c,v 1.20.2.4 2000/09/03 04:18:42 hubertf Exp $   */
+/*     $NetBSD: ftpio.c,v 1.20.2.5 2000/10/01 22:38:41 hubertf Exp $   */
 
 #include <sys/cdefs.h>
 #ifndef lint
-__RCSID("$NetBSD: ftpio.c,v 1.20.2.4 2000/09/03 04:18:42 hubertf Exp $");
+__RCSID("$NetBSD: ftpio.c,v 1.20.2.5 2000/10/01 22:38:41 hubertf Exp $");
 #endif
 
 /*
@@ -356,7 +356,7 @@
        /* (Only) the last one closes the link */
        if (tmp1 != NULL && tmp2 != NULL) {
                if (needclose)
-                       ftp_cmd("close\n", "\n(221 Goodbye.|Not connected.)\n");
+                       ftp_cmd("close\n", "\n(221 .*|Not connected.)\n");
                
                (void) close(ftpio.command);
                (void) close(ftpio.answer);