[rtems commit] PR 1998/networking - Move ftpd root initialization

[Joel Sherrill]

Module:    rtems
Branch:    4.10
Commit:    c5ee080497c6201800b3921001a3a400a2668cee
Changeset: http://git.rtems.org/rtems/commit/?id=c5ee080497c6201800b3921001a3a400a2668cee

Author:    Joel Sherrill <joel.sherrill at oarcorp.com>
Date:      Thu Feb  2 13:31:29 2012 -0600

PR 1998/networking - Move ftpd root initialization

From: Xiangfu <xiangfu at sharism.cc>
Signed-off-by: Xiangfu <xiangfu at sharism.cc>

---

 cpukit/ftpd/ftpd.c |   16 +++++++---------
 1 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/cpukit/ftpd/ftpd.c b/cpukit/ftpd/ftpd.c
index b0f22c4..5890bdc 100644
--- a/cpukit/ftpd/ftpd.c
+++ b/cpukit/ftpd/ftpd.c
@@ -2035,6 +2035,13 @@ rtems_initialize_ftpd(void)
 
   ftpd_access = rtems_ftpd_configuration.access;
 
+  ftpd_root = "/";
+  if ( rtems_ftpd_configuration.root &&
+       rtems_ftpd_configuration.root[0] == '/' )
+    ftpd_root = rtems_ftpd_configuration.root;
+
+  rtems_ftpd_configuration.root = ftpd_root;
+
   if (rtems_ftpd_configuration.tasks_count <= 0)
     rtems_ftpd_configuration.tasks_count = 1;
   count = rtems_ftpd_configuration.tasks_count;
@@ -2067,15 +2074,6 @@ rtems_initialize_ftpd(void)
     return RTEMS_UNSATISFIED;
   }
 
-  ftpd_root = "/";
-  if (
-    rtems_ftpd_configuration.root &&
-    rtems_ftpd_configuration.root[0] == '/'
-  )
-    ftpd_root = rtems_ftpd_configuration.root;
-
-  rtems_ftpd_configuration.root = ftpd_root;
-
   syslog(LOG_INFO, "ftpd: FTP daemon started (%d session%s max)",
     count, ((count > 1) ? "s" : ""));