emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ftpd: better usage text

Browse Source 
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
This commit is contained in:
Denys Vlasenko
2011-03-08 03:01:10 +01:00
parent 9283d7c5c2
commit 115c35d68e
2 changed files with 18 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
include/usage.src.h
View File

@@ -1273,23 +1273,6 @@ INSERT
"\n -m Show \"mode not cleared\" warnings" \
"\n -f Force file system check" \
#define ftpd_trivial_usage \
"[-wvS] [-t N] [-T N] [DIR]"
#define ftpd_full_usage "\n\n" \
"Anonymous FTP server\n" \
"\n" \
"ftpd should be used as an inetd service.\n" \
"ftpd's line for inetd.conf:\n" \
" 21 stream tcp nowait root ftpd ftpd /files/to/serve\n" \
"It also can be ran from tcpsvd:\n" \
" tcpsvd -vE 0.0.0.0 21 ftpd /files/to/serve\n" \
"\nOptions:" \
"\n -w Allow upload" \
"\n -v Log to stderr" \
"\n -S Log to syslog" \
"\n -t,-T Idle and absolute timeouts" \
"\n DIR Change root to this directory" \
#define ftpget_trivial_usage \
"[OPTIONS] HOST [LOCAL_FILE] REMOTE_FILE"
#define ftpget_full_usage "\n\n" \

19
networking/ftpd.c
View File

@@ -12,6 +12,23 @@
* You have to run this daemon via inetd.
*/
//usage:#define ftpd_trivial_usage
//usage: "[-wvS] [-t N] [-T N] [DIR]"
//usage:#define ftpd_full_usage "\n\n"
//usage: "Anonymous FTP server\n"
//usage: "\n"
//usage: "ftpd should be used as an inetd service.\n"
//usage: "ftpd's line for inetd.conf:\n"
//usage: " 21 stream tcp nowait root ftpd ftpd /files/to/serve\n"
//usage: "It also can be ran from tcpsvd:\n"
//usage: " tcpsvd -vE 0.0.0.0 21 ftpd /files/to/serve\n"
//usage: "\nOptions:"
//usage: "\n -w Allow upload"
//usage: "\n -v Log errors to stderr. -vv: verbose log"
//usage: "\n -S Log errors to syslog. -SS: verbose log"
//usage: "\n -t,-T Idle and absolute timeouts"
//usage: "\n DIR Change root to this directory"
#include "libbb.h"
#include <syslog.h>
#include <netinet/tcp.h>
@@ -206,7 +223,7 @@ cmdio_write_error(unsigned status)
{
*(uint32_t *) G.msg_err = status;
xwrite(STDOUT_FILENO, G.msg_err, sizeof("NNN " MSG_ERR) - 1);
if (G.verbose > 1)
if (G.verbose > 0)
verbose_log(G.msg_err);
}
#define WRITE_ERR(a) cmdio_write_error(STRNUM32sp(a))