fly316/PX4-Autopilot
7
0
Fork 0
mirror of https://gitee.com/mirrors_PX4/PX4-Autopilot.git synced 2026-10-22 22:43:34 +08:00
Code Issues Packages Projects Releases Wiki Activity

FTP server is marginally functional

Browse Source 
git-svn-id: https://nuttx.svn.sourceforge.net/svnroot/nuttx/trunk@4372 7fd9a85b-ad96-42d3-883c-3090e2eb8679
This commit is contained in:
patacongo
2012-02-05 19:32:42 +00:00
parent 3d42ab8282
commit 76f187ba85
3 changed files with 12 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
apps/netutils/ftpd/ftpd.c
+7 -2
View File
@@ -700,7 +700,7 @@ static FAR char *ftpd_strtok(bool skipspace, FAR const char *delimiters,
while (*sptr != '\0')
{
dptr = delimiters;
while (*sptr |= *dptr && *dptr != '\0')
while (*sptr != *dptr && *dptr != '\0')
{
dptr++;
}
@@ -4256,6 +4256,7 @@ int ftpd_session(FTPD_SESSION handle, int timeout)
session = (FAR struct ftpd_session_s *)zalloc(sizeof(struct ftpd_session_s));
if (!session)
{
ndbg("Failed to allocate session\n");
ret = -ENOMEM;
goto errout;
}
@@ -4291,6 +4292,7 @@ int ftpd_session(FTPD_SESSION handle, int timeout)
session->cmd.buffer = (FAR char *)malloc(session->cmd.buflen);
if (!session->cmd.buffer)
{
ndbg("Failed to allocate command buffer\n");
ret = -ENOMEM;
goto errout_with_session;
}
@@ -4300,6 +4302,7 @@ int ftpd_session(FTPD_SESSION handle, int timeout)
session->data.buffer = (FAR char *)malloc(session->data.buflen);
if (!session->data.buffer)
{
ndbg("Failed to allocate data buffer\n");
ret = -ENOMEM;
goto errout_with_session;
}
@@ -4310,7 +4313,8 @@ int ftpd_session(FTPD_SESSION handle, int timeout)
&session->cmd.addrlen, timeout);
if (session->cmd.sd < 0)
{
ret = -errno;
ndbg("ftpd_accept() failed: %d\n", session->cmd.sd);
ret = session->cmd.sd;
goto errout_with_session;
}
@@ -4320,6 +4324,7 @@ int ftpd_session(FTPD_SESSION handle, int timeout)
CONFIG_FTPD_WORKERSTACKSIZE);
if (ret < 0)
{
ndbg("ftpd_startworker() failed: %d\n", ret);
goto errout_with_session;
}