From owner-cvs-all Mon Jul 10 0:48:46 2000 Delivered-To: cvs-all@freebsd.org Received: from hitpro.hitachi.co.jp (hitpro.hitachi.co.jp [133.145.224.7]) by hub.freebsd.org (Postfix) with ESMTP id D937D37B506; Mon, 10 Jul 2000 00:48:26 -0700 (PDT) (envelope-from ume@bisd.hitachi.co.jp) Received: from bisdgw.bisd.hitachi.co.jp by hitpro.hitachi.co.jp (8.9.3/3.7W-hitpro) id QAA04109; Mon, 10 Jul 2000 16:48:09 +0900 (JST) Received: from plum.ssr.bisd.hitachi.co.jp by bisdgw.bisd.hitachi.co.jp (8.9.3+3.2W/3.7W-bisdgw) with ESMTP id QAA24567; Mon, 10 Jul 2000 16:48:08 +0900 (JST) (envelope-from ume@bisd.hitachi.co.jp) Received: from localhost (IDENT:W7s97gRc3BlxAu9MYeFehOurpGlPCVnXWpVm545AkfG599z5sUT1PFWQCRVx8OdR@localhost [::1]) by plum.ssr.bisd.hitachi.co.jp (8.10.1/3.7W-plum) with ESMTP id e6A7m7F39548; Mon, 10 Jul 2000 16:48:07 +0900 (JST) (envelope-from ume@bisd.hitachi.co.jp) Message-Id: <200007100748.e6A7m7F39548@plum.ssr.bisd.hitachi.co.jp> To: des@flood.ping.uio.no Cc: cvs-committers@FreeBSD.org, cvs-all@FreeBSD.org Subject: Re: cvs commit: src/lib/libfetch ftp.c From: Hajimu UMEMOTO (=?iso-2022-jp?B?GyRCR19LXBsoQiAbJEJIJRsoQg==?=) In-Reply-To: References: <200007100713.e6A7DKF39317@plum.ssr.bisd.hitachi.co.jp> X-Mailer: xcite1.20> Mew version 1.94.2 on XEmacs 21.1 (Bryce Canyon) X-PGP-Fingerprint: D3 3D D3 54 88 13 DE 22 3F 31 C4 4D A1 08 84 7B X-PGP-Public-Key: http://www.imasy.org/~ume/ume@bisd.hitachi.co.jp.asc X-URL: http://www.imasy.org/~ume/ X-OS: FreeBSD 4.0-STABLE Mime-Version: 1.0 Content-Type: Text/Plain; charset=us-ascii Content-Transfer-Encoding: 7bit Date: Mon, 10 Jul 2000 16:48:07 +0900 X-Dispatcher: imput version 20000414(IM141) Lines: 56 Sender: owner-cvs-all@FreeBSD.ORG Precedence: bulk X-Loop: FreeBSD.ORG >>>>> On 10 Jul 2000 09:41:50 +0200 >>>>> des@flood.ping.uio.no (Dag-Erling Smorgrav) said: des> How's this? Sounds good! Thanks. des> Index: ftp.c des> =================================================================== des> RCS file: /home/ncvs/src/lib/libfetch/ftp.c,v des> retrieving revision 1.28 des> diff -u -u -r1.28 ftp.c des> --- ftp.c 2000/07/08 09:27:47 1.28 des> +++ ftp.c 2000/07/10 07:39:51 des> @@ -300,15 +300,15 @@ des> * is IMHO the one and only weak point in the FTP protocol. des> */ des> ln = last_reply; des> - for (p = ln + 3; *p && !isdigit(*p); p++) des> - /* nothing */ ; des> - if (!*p) { des> - e = 999; des> - goto ouch; des> - } des> - switch (e) { des> + switch (e) { des> case FTP_PASSIVE_MODE: des> case FTP_LPASSIVE_MODE: des> + for (p = ln + 3; *p && !isdigit(*p); p++) des> + /* nothing */ ; des> + if (!*p) { des> + e = 999; des> + goto ouch; des> + } des> l = (e == FTP_PASSIVE_MODE ? 6 : 21); des> for (i = 0; *p && i < l; i++, p++) des> addr[i] = strtol(p, &p, 10); des> @@ -318,6 +318,13 @@ des> } des> break; des> case FTP_EPASSIVE_MODE: des> + for (p = ln + 3; *p && p != '('; p++) des> + /* nothing */ ; des> + if (!*p) { des> + e = 999; des> + goto ouch; des> + } des> + ++p; des> if (sscanf(p, "%c%c%c%d%c", &addr[0], &addr[1], &addr[2], des> &port, &addr[3]) != 5 || des> addr[0] != addr[1] || -- Hajimu UMEMOTO @ Business Solution System Development Div., Hitachi Ltd. E-Mail: ume@bisd.hitachi.co.jp ume@mahoroba.org ume@FreeBSD.org URL: http://www.imasy.org/~ume/ To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe cvs-all" in the body of the message