aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDenis Vlasenko <vda.linux@googlemail.com>2009-03-08 09:30:56 +0000
committerDenis Vlasenko <vda.linux@googlemail.com>2009-03-08 09:30:56 +0000
commit16b4a2de97d98d9683909b7b083035e65b3f87de (patch)
tree7f05fe86b045e8fb5186c09b8b2aea445f8c8c70
parentc8985bf3530d04946c5f4859eefdebb229c088c7 (diff)
downloadbusybox-w32-16b4a2de97d98d9683909b7b083035e65b3f87de.tar.gz
busybox-w32-16b4a2de97d98d9683909b7b083035e65b3f87de.tar.bz2
busybox-w32-16b4a2de97d98d9683909b7b083035e65b3f87de.zip
ftpd: new applet by Adam Tkac
$ size ftpd.o text data bss dec hex filename 5703 0 0 5703 1647 ftpd.o
-rw-r--r--include/applets.h1
-rw-r--r--include/usage.h14
-rw-r--r--networking/Config.in13
-rw-r--r--networking/Kbuild1
4 files changed, 29 insertions, 0 deletions
diff --git a/include/applets.h b/include/applets.h
index 15dcbdf5e..becb14066 100644
--- a/include/applets.h
+++ b/include/applets.h
@@ -164,6 +164,7 @@ USE_FSCK(APPLET(fsck, _BB_DIR_SBIN, _BB_SUID_NEVER))
164//USE_E2FSCK(APPLET_ODDNAME(fsck.ext2, e2fsck, _BB_DIR_SBIN, _BB_SUID_NEVER, fsck_ext2)) 164//USE_E2FSCK(APPLET_ODDNAME(fsck.ext2, e2fsck, _BB_DIR_SBIN, _BB_SUID_NEVER, fsck_ext2))
165//USE_E2FSCK(APPLET_ODDNAME(fsck.ext3, e2fsck, _BB_DIR_SBIN, _BB_SUID_NEVER, fsck_ext3)) 165//USE_E2FSCK(APPLET_ODDNAME(fsck.ext3, e2fsck, _BB_DIR_SBIN, _BB_SUID_NEVER, fsck_ext3))
166USE_FSCK_MINIX(APPLET_ODDNAME(fsck.minix, fsck_minix, _BB_DIR_SBIN, _BB_SUID_NEVER, fsck_minix)) 166USE_FSCK_MINIX(APPLET_ODDNAME(fsck.minix, fsck_minix, _BB_DIR_SBIN, _BB_SUID_NEVER, fsck_minix))
167USE_FTPD(APPLET(ftpd, _BB_DIR_USR_SBIN, _BB_SUID_NEVER))
167USE_FTPGET(APPLET_ODDNAME(ftpget, ftpgetput, _BB_DIR_USR_BIN, _BB_SUID_NEVER, ftpget)) 168USE_FTPGET(APPLET_ODDNAME(ftpget, ftpgetput, _BB_DIR_USR_BIN, _BB_SUID_NEVER, ftpget))
168USE_FTPPUT(APPLET_ODDNAME(ftpput, ftpgetput, _BB_DIR_USR_BIN, _BB_SUID_NEVER, ftpput)) 169USE_FTPPUT(APPLET_ODDNAME(ftpput, ftpgetput, _BB_DIR_USR_BIN, _BB_SUID_NEVER, ftpput))
169USE_FUSER(APPLET(fuser, _BB_DIR_USR_BIN, _BB_SUID_NEVER)) 170USE_FUSER(APPLET(fuser, _BB_DIR_USR_BIN, _BB_SUID_NEVER))
diff --git a/include/usage.h b/include/usage.h
index de6f03767..fb43fa369 100644
--- a/include/usage.h
+++ b/include/usage.h
@@ -1280,6 +1280,20 @@
1280 "\n -m Show \"mode not cleared\" warnings" \ 1280 "\n -m Show \"mode not cleared\" warnings" \
1281 "\n -f Force file system check" \ 1281 "\n -f Force file system check" \
1282 1282
1283#define ftpd_trivial_usage \
1284 "[-w] [DIR]"
1285#define ftpd_full_usage "\n\n" \
1286 "FTP server\n" \
1287 "\n" \
1288 "ftpd should be used as an inetd service.\n" \
1289 "ftpd's line for inetd.conf:\n" \
1290 " 21 stream tcp nowait root ftpd ftpd /files/to/serve\n" \
1291 "It also can be ran from tcpsvd:\n" \
1292 " tcpsvd -vE 0.0.0.0 21 ftpd /files/to/serve\n" \
1293 "\nOptions:" \
1294 "\n -w Allow upload" \
1295 "\n DIR Change root to ths directory" \
1296
1283#define ftpget_trivial_usage \ 1297#define ftpget_trivial_usage \
1284 "[options] remote-host local-file remote-file" 1298 "[options] remote-host local-file remote-file"
1285#define ftpget_full_usage "\n\n" \ 1299#define ftpget_full_usage "\n\n" \
diff --git a/networking/Config.in b/networking/Config.in
index c455ff408..f3ba85620 100644
--- a/networking/Config.in
+++ b/networking/Config.in
@@ -93,6 +93,19 @@ config FAKEIDENTD
93 fakeidentd listens on the ident port and returns a predefined 93 fakeidentd listens on the ident port and returns a predefined
94 fake value on any query. 94 fake value on any query.
95 95
96config FTPD
97 bool "ftpd"
98 default n
99 help
100 simple FTP daemon. You have to run it via inetd.
101
102config FEATURE_FTP_WRITE
103 bool "enable write"
104 default y
105 depends on FTPD
106 help
107 Enable all kinds of FTP write commands (you have to add -w parameter)
108
96config FTPGET 109config FTPGET
97 bool "ftpget" 110 bool "ftpget"
98 default n 111 default n
diff --git a/networking/Kbuild b/networking/Kbuild
index 77071269a..d632774ff 100644
--- a/networking/Kbuild
+++ b/networking/Kbuild
@@ -11,6 +11,7 @@ lib-$(CONFIG_BRCTL) += brctl.o
11lib-$(CONFIG_DNSD) += dnsd.o 11lib-$(CONFIG_DNSD) += dnsd.o
12lib-$(CONFIG_ETHER_WAKE) += ether-wake.o 12lib-$(CONFIG_ETHER_WAKE) += ether-wake.o
13lib-$(CONFIG_FAKEIDENTD) += isrv_identd.o isrv.o 13lib-$(CONFIG_FAKEIDENTD) += isrv_identd.o isrv.o
14lib-$(CONFIG_FTPD) += ftpd.o
14lib-$(CONFIG_FTPGET) += ftpgetput.o 15lib-$(CONFIG_FTPGET) += ftpgetput.o
15lib-$(CONFIG_FTPPUT) += ftpgetput.o 16lib-$(CONFIG_FTPPUT) += ftpgetput.o
16lib-$(CONFIG_HOSTNAME) += hostname.o 17lib-$(CONFIG_HOSTNAME) += hostname.o