diff options
author | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2011-06-05 14:08:26 +0000 |
---|---|---|
committer | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2011-06-05 14:08:26 +0000 |
commit | ab784567291b1925d616ea9b9d2577f42d2699a5 (patch) | |
tree | 7d4f4e1976f7a03adc136358ded5a2f866cf9285 /apps/netutils/ftpc/ftpc_putfile.c | |
parent | b20e2a5a26d3c9bbbea0dbea71227085bb8a135a (diff) | |
download | nuttx-ab784567291b1925d616ea9b9d2577f42d2699a5.tar.gz nuttx-ab784567291b1925d616ea9b9d2577f42d2699a5.tar.bz2 nuttx-ab784567291b1925d616ea9b9d2577f42d2699a5.zip |
More FTP bug fixes
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@3669 42af7a65-404d-4744-a932-0658087f49c3
Diffstat (limited to 'apps/netutils/ftpc/ftpc_putfile.c')
-rw-r--r-- | apps/netutils/ftpc/ftpc_putfile.c | 45 |
1 files changed, 38 insertions, 7 deletions
diff --git a/apps/netutils/ftpc/ftpc_putfile.c b/apps/netutils/ftpc/ftpc_putfile.c index 94942edba..e008da3b1 100644 --- a/apps/netutils/ftpc/ftpc_putfile.c +++ b/apps/netutils/ftpc/ftpc_putfile.c @@ -114,6 +114,8 @@ static int ftpc_sendbinary(FAR struct ftpc_session_s *session, buf = (char *)malloc(CONFIG_FTP_BUFSIZE); for (;;) { + /* Read data from the file */ + nread = fread(buf, sizeof(char), CONFIG_FTP_BUFSIZE, linstream); if (nread <= 0) { @@ -127,12 +129,17 @@ static int ftpc_sendbinary(FAR struct ftpc_session_s *session, break; } - if (ftpc_waitoutput(session) != 0) + /* Wait to make sure that we send the data without blocking */ + + ret = ftpc_waitoutput(session); + if (ret != OK) { ret = ERROR; break; } + /* Send the data */ + nwritten = fwrite(buf, sizeof(char), nread, routstream); if (nwritten != nread) { @@ -141,6 +148,8 @@ static int ftpc_sendbinary(FAR struct ftpc_session_s *session, break; } + /* Increment the size of the file sent */ + session->size += nread; } @@ -163,13 +172,19 @@ static int ftpc_sendtext(FAR struct ftpc_session_s *session, int c; int ret = OK; + /* Write characters one at a time. */ + while((c = fgetc(linstream)) != EOF) { + /* Make sure that we can send the character without blocking */ + if (ftpc_waitoutput(session) != 0) { break; } + /* If it is a newline, send a carriage return too */ + if (c == '\n') { if (fputc('\r', routstream) == EOF) @@ -179,9 +194,13 @@ static int ftpc_sendtext(FAR struct ftpc_session_s *session, break; } + /* Increment the size of the file sent */ + session->size++; } + /* Send the character */ + if (fputc(c, routstream) == EOF) { (void)ftpc_xfrabort(session, routstream); @@ -189,6 +208,8 @@ static int ftpc_sendtext(FAR struct ftpc_session_s *session, break; } + /* Increment the size of the file sent */ + session->size++; } @@ -340,20 +361,30 @@ static int ftpc_sendfile(struct ftpc_session_s *session, const char *path, * with a mark. */ - ret = ftpc_sockaccept(&session->data, FTPC_IS_PASSIVE(session)); - if (ret != OK) + /* In active mode, we need to accept a connection on the data socket + * (in passive mode, we have already connected the data channel to + * the FTP server). + */ + + if (!FTPC_IS_PASSIVE(session)) { - ndbg("Data connection not accepted\n"); - return ERROR; + ret = ftpc_sockaccept(&session->data); + if (ret != OK) + { + ndbg("Data connection not accepted\n"); + return ERROR; + } } + /* Then perform the data transfer */ + if (xfrmode == FTPC_XFRMODE_ASCII) { - ret = ftpc_sendbinary(session, stream, session->data.instream); + ret = ftpc_sendtext(session, stream, session->data.instream); } else { - ret = ftpc_sendtext(session, stream, session->data.instream); + ret = ftpc_sendbinary(session, stream, session->data.instream); } ftpc_sockflush(&session->data); |