New applet: httpd, by Glenn Engel

git-svn-id: svn://busybox.net/trunk/busybox@6269 69ca8d6d-28ef-0310-b511-8ec308f3f277

2 files changed, 17 insertions, 1 deletions

diff --git a/include/applets.h b/include/applets.h
index 5d8e7bb68..177e82352 100644
--- a/include/applets.h
+++ b/include/applets.h
@@ -236,6 +236,9 @@
 #ifdef CONFIG_HOSTNAME
         APPLET(hostname, hostname_main, _BB_DIR_BIN, _BB_SUID_NEVER)
 #endif
+#ifdef CONFIG_HTTPD
+        APPLET(httpd, httpd_main, _BB_DIR_USR_SBIN, _BB_SUID_NEVER)
+#endif
 #ifdef CONFIG_HUSH
         APPLET_NOUSAGE("hush", hush_main, _BB_DIR_BIN, _BB_SUID_NEVER)
 #endif
diff --git a/include/usage.h b/include/usage.h
index b5687115d..dfcc89626 100644
--- a/include/usage.h
+++ b/include/usage.h
@@ -775,7 +775,20 @@
 #define hostname_example_usage \
         "$ hostname\n" \
         "sage \n"
-
+#ifdef CONFIG_FEATURE_HTTPD_BASIC_AUTH
+  #define USAGE_HTTPD_BASIC_AUTH(a) a
+#else
+  #define USAGE_HTTPD_BASIC_AUTH(a)
+#endif
+#define httpd_trivial_usage \
+        "[-p <port>] [-d/-e <string>]" USAGE_HTTPD_BASIC_AUTH(" [-c <conf file>] [-r <realm>]")
+#define httpd_full_usage \
+       "Listens for incoming http server requests.\n"\
+       "Options:\n" \
+       "\t-p PORT\tServer port (default 80).\n" \
+       USAGE_HTTPD_BASIC_AUTH("\t-c FILE\tSpecifies configuration file.  (default httpd.conf)\n\t-r REALM\tAuthentication Realm for Basic Authentication\n") \
+       "\t-e STRING\tHtml encode STRING\n" \
+       "\t-d STRING\tURL decode STRING\n" 
 #define hwclock_trivial_usage \
         "[-r|--show] [-s|--hctosys] [-w|--systohc] [-l|--localtime] [-u|--utc]"
 #define hwclock_full_usage \