Werner's Miscellanea
Sign in or create your account | Project List | Help
Werner's Miscellanea Commit Details
Date: | 2012-01-03 14:18:53 (12 years 2 months ago) |
---|---|
Author: | Werner Almesberger |
Commit: | 73b9b503fe4137faceb7daa335db7b1131403df3 |
Message: | m1/patches/rtems/fix-ftpd-root.patch: allow ftpd to start in /ssd/
(by Xiangfu Liu) |
Files: |
m1/patches/rtems/fix-ftpd-root.patch (1 diff) m1/patches/rtems/series (1 diff) |
Change Details
m1/patches/rtems/fix-ftpd-root.patch | ||
---|---|---|
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 | @@ -2068,6 +2068,14 @@ | |
9 | ||
10 | ftpd_access = rtems_ftpd_configuration.access; | |
11 | ||
12 | + if ( | |
13 | + rtems_ftpd_configuration.root && | |
14 | + rtems_ftpd_configuration.root[0] == '/' | |
15 | + ) | |
16 | + ftpd_root = rtems_ftpd_configuration.root; | |
17 | + | |
18 | + rtems_ftpd_configuration.root = ftpd_root; | |
19 | + | |
20 | if (rtems_ftpd_configuration.tasks_count <= 0) | |
21 | rtems_ftpd_configuration.tasks_count = 1; | |
22 | count = rtems_ftpd_configuration.tasks_count; | |
23 | @@ -2100,15 +2108,6 @@ | |
24 | return RTEMS_UNSATISFIED; | |
25 | } | |
26 | ||
27 | - ftpd_root = "/"; | |
28 | - if ( | |
29 | - rtems_ftpd_configuration.root && | |
30 | - rtems_ftpd_configuration.root[0] == '/' | |
31 | - ) | |
32 | - ftpd_root = rtems_ftpd_configuration.root; | |
33 | - | |
34 | - rtems_ftpd_configuration.root = ftpd_root; | |
35 | - | |
36 | syslog(LOG_INFO, "ftpd: FTP daemon started (%d session%s max)", | |
37 | count, ((count > 1) ? "s" : "")); | |
38 |
m1/patches/rtems/series | ||
---|---|---|
16 | 16 | #fix-timer-includes.patch |
17 | 17 | milkymist-usb-midi.patch |
18 | 18 | #milkymist-midi-opt.patch - applied 2011-12-06 |
19 | fix-ftpd-root.patch |
Branches:
master