RTOS/rtems
1
0
Fork 0
forked from Imagelibrary/rtems
Code Pull Requests Activity

PR 1998/networking - Move ftpd root initialization

Browse Source 
From: Xiangfu <xiangfu@sharism.cc>
Signed-off-by: Xiangfu <xiangfu@sharism.cc>
This commit is contained in:
Joel Sherrill
2012-02-02 13:33:09 -06:00
parent 0f700ffc21
commit 796bb3f51c
1 changed files with 7 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
cpukit/ftpd/ftpd.c
View File

@@ -2068,6 +2068,13 @@ rtems_initialize_ftpd(void)
ftpd_access = rtems_ftpd_configuration.access; 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) if (rtems_ftpd_configuration.tasks_count <= 0)
rtems_ftpd_configuration.tasks_count = 1; rtems_ftpd_configuration.tasks_count = 1;
count = rtems_ftpd_configuration.tasks_count; count = rtems_ftpd_configuration.tasks_count;
@@ -2100,15 +2107,6 @@ rtems_initialize_ftpd(void)
return RTEMS_UNSATISFIED; 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)", syslog(LOG_INFO, "ftpd: FTP daemon started (%d session%s max)",
count, ((count > 1) ? "s" : "")); count, ((count > 1) ? "s" : ""));