generic-library/curl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ftpsendf() is remade to send the entire command in one write(), as some

Browse Source 
firewalls (like FW-1) seems to dislike split-up writes at times...
This commit is contained in:
Daniel Stenberg 2000-12-30 13:12:30 +00:00
parent 910fc8522a
commit f4acbed214
1 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
lib/sendf.c
View File

@ -60,8 +60,8 @@
#ifdef KRB4 #ifdef KRB4
#include "security.h" #include "security.h"
#include <string.h>
#endif #endif
#include <string.h>
/* The last #include file should be: */ /* The last #include file should be: */
#ifdef MALLOCDEBUG #ifdef MALLOCDEBUG
#include "memdebug.h" #include "memdebug.h"
@ -123,37 +123,39 @@ size_t sendf(int fd, struct UrlData *data, char *fmt, ...)
/* /*
* ftpsendf() sends the formated string as a ftp command to a ftp server * ftpsendf() sends the formated string as a ftp command to a ftp server
*
* NOTE: we build the command in a fixed-length buffer, which sets length
* restrictions on the command!
*
*/ */
size_t ftpsendf(int fd, struct connectdata *conn, char *fmt, ...) size_t ftpsendf(int fd, struct connectdata *conn, char *fmt, ...)
{ {
size_t bytes_written; size_t bytes_written;
char *s; char s[256];
va_list ap; va_list ap;
va_start(ap, fmt); va_start(ap, fmt);
s = mvaprintf(fmt, ap); vsnprintf(s, 250, fmt, ap);
va_end(ap); va_end(ap);
if(!s)
return 0; /* failure */
if(conn->data->bits.verbose) if(conn->data->bits.verbose)
fprintf(conn->data->err, "> %s\n", s); fprintf(conn->data->err, "> %s\n", s);
strcat(s, "\r\n"); /* append a trailing CRLF */
#ifdef KRB4 #ifdef KRB4
if(conn->sec_complete && conn->data->cmdchannel) { if(conn->sec_complete && conn->data->cmdchannel) {
bytes_written = sec_fprintf(conn, conn->data->cmdchannel, s); bytes_written = sec_fprintf(conn, conn->data->cmdchannel, s);
bytes_written += fprintf(conn->data->cmdchannel, "\r\n");
fflush(conn->data->cmdchannel); fflush(conn->data->cmdchannel);
} }
else else
#endif /* KRB4 */ #endif /* KRB4 */
{ {
bytes_written = swrite(fd, s, strlen(s)); bytes_written = swrite(fd, s, strlen(s));
bytes_written += swrite(fd, "\r\n", 2);
} }
free(s); /* free the output string */
return(bytes_written); return(bytes_written);
} }
/* ssend() sends plain (binary) data to the server */ /* ssend() sends plain (binary) data to the server */
size_t ssend(int fd, struct connectdata *conn, void *mem, size_t len) size_t ssend(int fd, struct connectdata *conn, void *mem, size_t len)
{ {