Distfile has been rerolled with fix initialy found in files/patch-src::ftp.c

Noticed by: kris / pointyhat
This commit is contained in:
Edwin Groothuis 2004-07-10 11:43:30 +00:00
parent 46ba252498
commit 95daff2cd2
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=113329
3 changed files with 1 additions and 36 deletions

View File

@ -7,6 +7,7 @@
PORTNAME= wput
PORTVERSION= 0.4
PORTREVISION= 1
CATEGORIES= ftp
MASTER_SITES= http://itooktheredpill.dyndns.org/wput/
EXTRACT_SUFX= .tgz

View File

@ -1,2 +0,0 @@
MD5 (wput-0.4.tgz) = 11b73023fe49f4d9d6f6254433c152ae
SIZE (wput-0.4.tgz) = 154911

View File

@ -1,34 +0,0 @@
--- src/ftp.c.orig Mon Jul 5 21:26:46 2004
+++ src/ftp.c Mon Jul 5 21:39:05 2004
@@ -798,15 +798,30 @@
int get_msg(int csock, char * msg, int buflen){
int res = 0;
+ char *s;
do {
memset(msg, 0, buflen);
res = recv(csock, msg, buflen-1, 0);
printout(vDEBUG, "%s", msg);
+ /*
+ * Multiline responses should of course only check on the last line.
+ * If there are two \n's from the end of the string in the string,
+ * the check at the start of second last one.
+ */
+ if ((s=strrchr(msg,'\n'))!=NULL) {
+ if ((s=strrchr(s-1,'\n'))!=NULL) {
+ s++;
+ if (*s=='\r') s++;
+ } else
+ s=msg;
+ } else {
+ s=msg;
+ }
/* multiline messages are required by rfc to have a hiphen
* after the command-code (e.g. 250-).
* this counts for all but the last one, so look out for it. */
- } while(msg[3] == '-');
+ } while(s[3] == '-');
return res;
}