Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/netbsd-3]: src/usr.sbin/pkg_install/lib Pull up revision 1.67 (requested...



details:   https://anonhg.NetBSD.org/src/rev/2c6f3aa7230c
branches:  netbsd-3
changeset: 574925:2c6f3aa7230c
user:      tron <tron%NetBSD.org@localhost>
date:      Sat Mar 19 13:16:56 2005 +0000

description:
Pull up revision 1.67 (requested by hubertf in ticket #8):
Address PR pkg/24744 by Jarmo Jaakkola <jarmo.jaakkola%iki.fi@localhost>:
  * ftp.fi.netbsd.org returns "257" in return to a "cd" command, accept that
    (in addition to 250 and 550). Seems to be allowed per RFC 959.
  * Make buffer for reply bigger (not too big, as it may hit performance).

diffstat:

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

diffs (32 lines):

diff -r 645575507a45 -r 2c6f3aa7230c usr.sbin/pkg_install/lib/ftpio.c
--- a/usr.sbin/pkg_install/lib/ftpio.c  Thu Mar 17 09:22:02 2005 +0000
+++ b/usr.sbin/pkg_install/lib/ftpio.c  Sat Mar 19 13:16:56 2005 +0000
@@ -1,8 +1,8 @@
-/*     $NetBSD: ftpio.c,v 1.66 2005/01/06 11:56:39 agc Exp $   */
+/*     $NetBSD: ftpio.c,v 1.66.2.1 2005/03/19 13:16:56 tron Exp $      */
 
 #include <sys/cdefs.h>
 #ifndef lint
-__RCSID("$NetBSD: ftpio.c,v 1.66 2005/01/06 11:56:39 agc Exp $");
+__RCSID("$NetBSD: ftpio.c,v 1.66.2.1 2005/03/19 13:16:56 tron Exp $");
 #endif
 
 /*-
@@ -139,7 +139,7 @@
 expect(int fd, const char *str, int *ftprc)
 {
        int rc;
-       char buf[90];  
+       char buf[256];  
 #if EXPECT_DEBUG
        char *vstr;
 #endif /* EXPECT_DEBUG */
@@ -654,7 +654,7 @@
        }
 
        /* Sync - don't remove */
-       rc = ftp_cmd("cd .\n", "\n(550|250).*\n");
+       rc = ftp_cmd("cd .\n", "\n(550|250|257).*\n");
        if (rc != 250) {
                warnx("chdir failed!");
                unlink(tmpname);        /* remove clutter */



Home | Main Index | Thread Index | Old Index