diff options
| author | Joel Sherrill <joel.sherrill@oarcorp.com> | 2012-02-02 13:33:09 -0600 |
|---|---|---|
| committer | Joel Sherrill <joel.sherrill@oarcorp.com> | 2012-02-02 13:33:09 -0600 |
| commit | 796bb3f51cc2a1f7789a337107ae1edfc107d7f5 (patch) | |
| tree | b148d3c9612816001a10b74a10a44fc158bf2fd1 /cpukit/ftpd/ftpd.c | |
| parent | 0f700ffc211fe2c54407f19e4f5e9db38a29215a (diff) | |
PR 1998/networking - Move ftpd root initialization
From: Xiangfu <xiangfu@sharism.cc>
Signed-off-by: Xiangfu <xiangfu@sharism.cc>
Diffstat (limited to 'cpukit/ftpd/ftpd.c')
| -rw-r--r-- | 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 bcb55f3622..8ac2bf367c 100644 --- a/cpukit/ftpd/ftpd.c +++ b/cpukit/ftpd/ftpd.c @@ -2068,6 +2068,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; @@ -2100,15 +2107,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" : "")); |