d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use fetch_putln()

Browse Source
This commit is contained in:
Dag-Erling Smørgrav 2000-07-11 23:50:22 +00:00
parent a176302737
commit e137bceb8f
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=62982
1 changed files with 5 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
lib/libfetch/ftp.c
View File

@ -57,7 +57,6 @@
#include <sys/param.h>
#include <sys/socket.h>
#include <sys/uio.h>
#include <netinet/in.h>
#include <ctype.h>
@ -92,8 +91,6 @@
#define FTP_FILE_OK 350
#define FTP_SYNTAX_ERROR 500
static char ENDL[2] = "\r\n";
static struct url cached_host;
static int cached_socket;
@ -170,12 +167,12 @@ static int
_ftp_cmd(int cd, char *fmt, ...)
{
va_list ap;
struct iovec iov[2];
size_t len;
char *msg;
int r;
va_start(ap, fmt);
vasprintf(&msg, fmt, ap);
len = vasprintf(&msg, fmt, ap);
va_end(ap);
if (msg == NULL) {
@ -183,13 +180,10 @@ _ftp_cmd(int cd, char *fmt, ...)
_fetch_syserr();
return -1;
}
DEBUG(fprintf(stderr, "\033[1m>>> %s\n\033[m", msg));
iov[0].iov_base = msg;
iov[0].iov_len = strlen(msg);
iov[1].iov_base = ENDL;
iov[1].iov_len = sizeof ENDL;
r = writev(cd, iov, 2);
r = _fetch_putln(cd, msg, len);
free(msg);
if (r == -1) {
_fetch_syserr();
return -1;