Date: Mon, 10 Jul 2000 16:48:07 +0900 From: Hajimu UMEMOTO (=?iso-2022-jp?B?GyRCR19LXBsoQiAbJEJIJRsoQg==?=) <ume@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 Message-ID: <200007100748.e6A7m7F39548@plum.ssr.bisd.hitachi.co.jp> In-Reply-To: <xzp1z123001.fsf@flood.ping.uio.no> References: <xzpsnti325b.fsf@flood.ping.uio.no> <200007100713.e6A7DKF39317@plum.ssr.bisd.hitachi.co.jp> <xzp1z123001.fsf@flood.ping.uio.no>
next in thread | previous in thread | raw e-mail | index | archive | help
>>>>> 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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200007100748.e6A7m7F39548>