diff options
author | patacongo <patacongo@7fd9a85b-ad96-42d3-883c-3090e2eb8679> | 2012-02-05 19:32:42 +0000 |
---|---|---|
committer | patacongo <patacongo@7fd9a85b-ad96-42d3-883c-3090e2eb8679> | 2012-02-05 19:32:42 +0000 |
commit | 95620c7dd324ab9fb682bf3d3af596fc4d231699 (patch) | |
tree | 7b2f4f57800fb437bb8f6b17f99cb5a76e6aaad9 /apps | |
parent | 9cb5cc8ab735db7f0bb0cf6c599cefcd36021766 (diff) |
FTP server is marginally functional
git-svn-id: https://nuttx.svn.sourceforge.net/svnroot/nuttx/trunk@4372 7fd9a85b-ad96-42d3-883c-3090e2eb8679
Diffstat (limited to 'apps')
-rwxr-xr-x | apps/examples/ftpd/ftpd_main.c | 8 | ||||
-rwxr-xr-x | apps/netutils/ftpd/ftpd.c | 9 |
2 files changed, 11 insertions, 6 deletions
diff --git a/apps/examples/ftpd/ftpd_main.c b/apps/examples/ftpd/ftpd_main.c index 1f43e317ce..c5c23256d3 100755 --- a/apps/examples/ftpd/ftpd_main.c +++ b/apps/examples/ftpd/ftpd_main.c @@ -130,11 +130,11 @@ static void ftpd_accounts(FTPD_SESSION handle) { account = &g_ftpdaccounts[i]; - printf("%d. %s account: USER=%s PASSWORD=%s HOME=%s\n", + printf("%d. %s account: USER=%s PASSWORD=%s HOME=%s\n", i+1, (account->flags & FTPD_ACCOUNTFLAG_SYSTEM) != 0 ? "Root" : "User", - (account->user) ? "(none)" : account->user, - (account->password) ? "(none)" : account->password, - (account->home) ? "(none)" : account->home); + (!account->user) ? "(none)" : account->user, + (!account->password) ? "(none)" : account->password, + (!account->home) ? "(none)" : account->home); ftpd_adduser(handle, account->flags, account->user, account->password, account->home); diff --git a/apps/netutils/ftpd/ftpd.c b/apps/netutils/ftpd/ftpd.c index 3dead6cb1c..410ea8ef4e 100755 --- a/apps/netutils/ftpd/ftpd.c +++ b/apps/netutils/ftpd/ftpd.c @@ -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; } |