From c5ee080497c6201800b3921001a3a400a2668cee Mon Sep 17 00:00:00 2001 From: Joel Sherrill Date: Thu, 2 Feb 2012 13:31:29 -0600 Subject: PR 1998/networking - Move ftpd root initialization From: Xiangfu Signed-off-by: Xiangfu --- cpukit/ftpd/ftpd.c | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) (limited to 'cpukit') diff --git a/cpukit/ftpd/ftpd.c b/cpukit/ftpd/ftpd.c index b0f22c480c..5890bdc287 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" : "")); -- cgit v1.2.3