diff options
| author | Rob Landley <rob@landley.net> | 2006-02-20 23:05:06 +0000 |
|---|---|---|
| committer | Rob Landley <rob@landley.net> | 2006-02-20 23:05:06 +0000 |
| commit | 0d8766a3b13ea2a1cbee6f7cf4001ee1c7cc402f (patch) | |
| tree | aab524d6a9ad034eb5f84dfdb5e41b4e51c1a6cd /networking/httpd.c | |
| parent | 06249fee39c8415355203e8fbef89c3e3918b986 (diff) | |
| download | busybox-w32-0d8766a3b13ea2a1cbee6f7cf4001ee1c7cc402f.tar.gz busybox-w32-0d8766a3b13ea2a1cbee6f7cf4001ee1c7cc402f.tar.bz2 busybox-w32-0d8766a3b13ea2a1cbee6f7cf4001ee1c7cc402f.zip | |
Rename UNUSE() to SKIP().
Diffstat (limited to 'networking/httpd.c')
| -rw-r--r-- | networking/httpd.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/networking/httpd.c b/networking/httpd.c index 9c8cbb05f..6e80fd9be 100644 --- a/networking/httpd.c +++ b/networking/httpd.c | |||
| @@ -1995,7 +1995,7 @@ enum httpd_opts_nums { | |||
| 1995 | USE_FEATURE_HTTPD_BASIC_AUTH(r_opt_realm,) | 1995 | USE_FEATURE_HTTPD_BASIC_AUTH(r_opt_realm,) |
| 1996 | USE_FEATURE_HTTPD_AUTH_MD5(m_opt_md5,) | 1996 | USE_FEATURE_HTTPD_AUTH_MD5(m_opt_md5,) |
| 1997 | USE_FEATURE_HTTPD_SETUID(u_opt_setuid,) | 1997 | USE_FEATURE_HTTPD_SETUID(u_opt_setuid,) |
| 1998 | UNUSE_FEATURE_HTTPD_USAGE_FROM_INETD_ONLY(p_opt_port,) | 1998 | SKIP_FEATURE_HTTPD_USAGE_FROM_INETD_ONLY(p_opt_port,) |
| 1999 | }; | 1999 | }; |
| 2000 | 2000 | ||
| 2001 | static const char httpd_opts[]="c:d:h:" | 2001 | static const char httpd_opts[]="c:d:h:" |
| @@ -2003,25 +2003,25 @@ static const char httpd_opts[]="c:d:h:" | |||
| 2003 | USE_FEATURE_HTTPD_BASIC_AUTH("r:") | 2003 | USE_FEATURE_HTTPD_BASIC_AUTH("r:") |
| 2004 | USE_FEATURE_HTTPD_AUTH_MD5("m:") | 2004 | USE_FEATURE_HTTPD_AUTH_MD5("m:") |
| 2005 | USE_FEATURE_HTTPD_SETUID("u:") | 2005 | USE_FEATURE_HTTPD_SETUID("u:") |
| 2006 | UNUSE_FEATURE_HTTPD_USAGE_FROM_INETD_ONLY("p:"); | 2006 | SKIP_FEATURE_HTTPD_USAGE_FROM_INETD_ONLY("p:"); |
| 2007 | 2007 | ||
| 2008 | #define OPT_CONFIG_FILE (1<<c_opt_config_file) | 2008 | #define OPT_CONFIG_FILE (1<<c_opt_config_file) |
| 2009 | #define OPT_DECODE_URL (1<<d_opt_decode_url) | 2009 | #define OPT_DECODE_URL (1<<d_opt_decode_url) |
| 2010 | #define OPT_HOME_HTTPD (1<<h_opt_home_httpd) | 2010 | #define OPT_HOME_HTTPD (1<<h_opt_home_httpd) |
| 2011 | 2011 | ||
| 2012 | #define OPT_ENCODE_URL USE_FEATURE_HTTPD_ENCODE_URL_STR((1<<e_opt_encode_url)) \ | 2012 | #define OPT_ENCODE_URL USE_FEATURE_HTTPD_ENCODE_URL_STR((1<<e_opt_encode_url)) \ |
| 2013 | UNUSE_FEATURE_HTTPD_ENCODE_URL_STR(0) | 2013 | SKIP_FEATURE_HTTPD_ENCODE_URL_STR(0) |
| 2014 | 2014 | ||
| 2015 | #define OPT_REALM USE_FEATURE_HTTPD_BASIC_AUTH((1<<r_opt_realm)) \ | 2015 | #define OPT_REALM USE_FEATURE_HTTPD_BASIC_AUTH((1<<r_opt_realm)) \ |
| 2016 | UNUSE_FEATURE_HTTPD_BASIC_AUTH(0) | 2016 | SKIP_FEATURE_HTTPD_BASIC_AUTH(0) |
| 2017 | 2017 | ||
| 2018 | #define OPT_MD5 USE_FEATURE_HTTPD_AUTH_MD5((1<<m_opt_md5)) \ | 2018 | #define OPT_MD5 USE_FEATURE_HTTPD_AUTH_MD5((1<<m_opt_md5)) \ |
| 2019 | UNUSE_FEATURE_HTTPD_AUTH_MD5(0) | 2019 | SKIP_FEATURE_HTTPD_AUTH_MD5(0) |
| 2020 | 2020 | ||
| 2021 | #define OPT_SETUID USE_FEATURE_HTTPD_SETUID((1<<u_opt_setuid)) \ | 2021 | #define OPT_SETUID USE_FEATURE_HTTPD_SETUID((1<<u_opt_setuid)) \ |
| 2022 | UNUSE_FEATURE_HTTPD_SETUID(0) | 2022 | SKIP_FEATURE_HTTPD_SETUID(0) |
| 2023 | 2023 | ||
| 2024 | #define OPT_PORT UNUSE_FEATURE_HTTPD_USAGE_FROM_INETD_ONLY((1<<p_opt_port)) \ | 2024 | #define OPT_PORT SKIP_FEATURE_HTTPD_USAGE_FROM_INETD_ONLY((1<<p_opt_port)) \ |
| 2025 | USE_FEATURE_HTTPD_USAGE_FROM_INETD_ONLY(0) | 2025 | USE_FEATURE_HTTPD_USAGE_FROM_INETD_ONLY(0) |
| 2026 | 2026 | ||
| 2027 | 2027 | ||
| @@ -2035,8 +2035,8 @@ int httpd_main(int argc, char *argv[]) | |||
| 2035 | const char *home_httpd = home; | 2035 | const char *home_httpd = home; |
| 2036 | char *url_for_decode; | 2036 | char *url_for_decode; |
| 2037 | USE_FEATURE_HTTPD_ENCODE_URL_STR(const char *url_for_encode;) | 2037 | USE_FEATURE_HTTPD_ENCODE_URL_STR(const char *url_for_encode;) |
| 2038 | UNUSE_FEATURE_HTTPD_USAGE_FROM_INETD_ONLY(const char *s_port;) | 2038 | SKIP_FEATURE_HTTPD_USAGE_FROM_INETD_ONLY(const char *s_port;) |
| 2039 | UNUSE_FEATURE_HTTPD_USAGE_FROM_INETD_ONLY(int server;) | 2039 | SKIP_FEATURE_HTTPD_USAGE_FROM_INETD_ONLY(int server;) |
| 2040 | 2040 | ||
| 2041 | USE_FEATURE_HTTPD_SETUID(const char *s_uid;) | 2041 | USE_FEATURE_HTTPD_SETUID(const char *s_uid;) |
| 2042 | USE_FEATURE_HTTPD_SETUID(long uid = -1;) | 2042 | USE_FEATURE_HTTPD_SETUID(long uid = -1;) |
| @@ -2060,7 +2060,7 @@ int httpd_main(int argc, char *argv[]) | |||
| 2060 | USE_FEATURE_HTTPD_BASIC_AUTH(, &(config->realm)) | 2060 | USE_FEATURE_HTTPD_BASIC_AUTH(, &(config->realm)) |
| 2061 | USE_FEATURE_HTTPD_AUTH_MD5(, &pass) | 2061 | USE_FEATURE_HTTPD_AUTH_MD5(, &pass) |
| 2062 | USE_FEATURE_HTTPD_SETUID(, &s_uid) | 2062 | USE_FEATURE_HTTPD_SETUID(, &s_uid) |
| 2063 | UNUSE_FEATURE_HTTPD_USAGE_FROM_INETD_ONLY(, &s_port) | 2063 | SKIP_FEATURE_HTTPD_USAGE_FROM_INETD_ONLY(, &s_port) |
| 2064 | ); | 2064 | ); |
| 2065 | 2065 | ||
| 2066 | if(opt & OPT_DECODE_URL) { | 2066 | if(opt & OPT_DECODE_URL) { |