Werner's Miscellanea
Sign in or create your account | Project List | Help
Werner's Miscellanea Git Source Tree
Root/
Source at commit b6b61b1 created 11 years 10 months ago. By Xiangfu, m1/patches/rtems: refresh | |
---|---|
1 | From: Xiangfu <xiangfu@sharism.cc> |
2 | |
3 | Signed-off-by: Xiangfu <xiangfu@sharism.cc> |
4 | |
5 | Index: rtems/cpukit/ftpd/ftpd.c |
6 | =================================================================== |
7 | --- rtems.orig/cpukit/ftpd/ftpd.c 2012-01-03 10:16:17.000000000 -0300 |
8 | +++ rtems/cpukit/ftpd/ftpd.c 2012-01-03 10:17:10.000000000 -0300 |
9 | @@ -2068,6 +2068,14 @@ |
10 | |
11 | ftpd_access = rtems_ftpd_configuration.access; |
12 | |
13 | + if ( |
14 | + rtems_ftpd_configuration.root && |
15 | + rtems_ftpd_configuration.root[0] == '/' |
16 | + ) |
17 | + ftpd_root = rtems_ftpd_configuration.root; |
18 | + |
19 | + rtems_ftpd_configuration.root = ftpd_root; |
20 | + |
21 | if (rtems_ftpd_configuration.tasks_count <= 0) |
22 | rtems_ftpd_configuration.tasks_count = 1; |
23 | count = rtems_ftpd_configuration.tasks_count; |
24 | @@ -2100,15 +2108,6 @@ |
25 | return RTEMS_UNSATISFIED; |
26 | } |
27 | |
28 | - ftpd_root = "/"; |
29 | - if ( |
30 | - rtems_ftpd_configuration.root && |
31 | - rtems_ftpd_configuration.root[0] == '/' |
32 | - ) |
33 | - ftpd_root = rtems_ftpd_configuration.root; |
34 | - |
35 | - rtems_ftpd_configuration.root = ftpd_root; |
36 | - |
37 | syslog(LOG_INFO, "ftpd: FTP daemon started (%d session%s max)", |
38 | count, ((count > 1) ? "s" : "")); |
39 | |
40 |
Branches:
master