From cfae8d45a94832c8eae15ccad2012c37ed2027d7 Mon Sep 17 00:00:00 2001
From: patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3>
Date: Sun, 5 Feb 2012 19:32:42 +0000
Subject: FTP server is marginally functional

git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@4372 42af7a65-404d-4744-a932-0658087f49c3
---
 apps/netutils/ftpd/ftpd.c | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

(limited to 'apps/netutils/ftpd')

diff --git a/apps/netutils/ftpd/ftpd.c b/apps/netutils/ftpd/ftpd.c
index 3dead6cb1..410ea8ef4 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;
     }
 
-- 
cgit v1.2.3