remove awx from busybox, refresh patches

SVN-Revision: 12497
owl
Felix Fietkau 2008-09-02 11:18:47 +00:00
parent e833cd9c61
commit 2a58b9c729
7 changed files with 8 additions and 1629 deletions

View File

@ -12,13 +12,6 @@ config BUSYBOX_CONFIG_AWK
Awk is used as a pattern scanning and processing language. This is Awk is used as a pattern scanning and processing language. This is
the BusyBox implementation of that programming language. the BusyBox implementation of that programming language.
config BUSYBOX_CONFIG_AWX
bool "Enable awx (awk web extension)"
default y
depends on BUSYBOX_CONFIG_AWK
help
awx - awk web extension
config BUSYBOX_CONFIG_FEATURE_AWK_MATH config BUSYBOX_CONFIG_FEATURE_AWK_MATH
bool "Enable math functions (requires libm)" bool "Enable math functions (requires libm)"
default y default y

View File

@ -52,7 +52,7 @@
(g_query ? "?" : ""), (g_query ? "?" : ""),
(g_query ? g_query : "")); (g_query ? g_query : ""));
} }
@@ -1912,8 +1919,12 @@ @@ -1923,8 +1930,12 @@
} while (*++tptr); } while (*++tptr);
*++urlp = '\0'; /* terminate after last character */ *++urlp = '\0'; /* terminate after last character */
@ -66,7 +66,7 @@
if (is_directory(urlcopy + 1, 1, &sb)) { if (is_directory(urlcopy + 1, 1, &sb)) {
found_moved_temporarily = urlcopy; found_moved_temporarily = urlcopy;
} }
@@ -2263,7 +2274,9 @@ @@ -2274,7 +2285,9 @@
#endif #endif
enum { enum {
@ -77,7 +77,7 @@
d_opt_decode_url, d_opt_decode_url,
h_opt_home_httpd, h_opt_home_httpd,
USE_FEATURE_HTTPD_ENCODE_URL_STR(e_opt_encode_url,) USE_FEATURE_HTTPD_ENCODE_URL_STR(e_opt_encode_url,)
@@ -2312,12 +2325,13 @@ @@ -2323,12 +2336,13 @@
/* We do not "absolutize" path given by -h (home) opt. /* We do not "absolutize" path given by -h (home) opt.
* If user gives relative path in -h, * If user gives relative path in -h,
* $SCRIPT_FILENAME will not be set. */ * $SCRIPT_FILENAME will not be set. */

View File

@ -1,6 +1,6 @@
--- a/networking/httpd.c --- a/networking/httpd.c
+++ b/networking/httpd.c +++ b/networking/httpd.c
@@ -1797,6 +1797,7 @@ @@ -1808,6 +1808,7 @@
char *header_ptr = header_ptr; char *header_ptr = header_ptr;
Htaccess_Proxy *proxy_entry; Htaccess_Proxy *proxy_entry;
#endif #endif

View File

@ -29,7 +29,7 @@
if (post_len) if (post_len)
putenv(xasprintf("CONTENT_LENGTH=%d", post_len)); putenv(xasprintf("CONTENT_LENGTH=%d", post_len));
if (cookie) if (cookie)
@@ -2009,6 +2017,10 @@ @@ -2020,6 +2028,10 @@
referer = xstrdup(skip_whitespace(iobuf + sizeof("Referer:")-1)); referer = xstrdup(skip_whitespace(iobuf + sizeof("Referer:")-1));
} else if (STRNCASECMP(iobuf, "User-Agent:") == 0) { } else if (STRNCASECMP(iobuf, "User-Agent:") == 0) {
user_agent = xstrdup(skip_whitespace(iobuf + sizeof("User-Agent:")-1)); user_agent = xstrdup(skip_whitespace(iobuf + sizeof("User-Agent:")-1));

View File

@ -1,6 +1,6 @@
--- a/include/libbb.h --- a/include/libbb.h
+++ b/include/libbb.h +++ b/include/libbb.h
@@ -1211,6 +1211,7 @@ @@ -1214,6 +1214,7 @@
extern const char bb_uuenc_tbl_std[]; extern const char bb_uuenc_tbl_std[];
void bb_uuencode(char *store, const void *s, int length, const char *tbl); void bb_uuencode(char *store, const void *s, int length, const char *tbl);
@ -8,7 +8,7 @@
typedef struct sha1_ctx_t { typedef struct sha1_ctx_t {
uint32_t count[2]; uint32_t count[2];
uint32_t hash[5]; uint32_t hash[5];
@@ -1232,6 +1233,8 @@ @@ -1235,6 +1236,8 @@
void md5_begin(md5_ctx_t *ctx); void md5_begin(md5_ctx_t *ctx);
void md5_hash(const void *data, size_t length, md5_ctx_t *ctx); void md5_hash(const void *data, size_t length, md5_ctx_t *ctx);
void *md5_end(void *resbuf, md5_ctx_t *ctx); void *md5_end(void *resbuf, md5_ctx_t *ctx);

File diff suppressed because it is too large Load Diff

View File

@ -1,6 +1,6 @@
--- a/editors/awk.c --- a/editors/awk.c
+++ b/editors/awk.c +++ b/editors/awk.c
@@ -2046,27 +2046,27 @@ @@ -2035,27 +2035,27 @@
break; break;
case B_an: case B_an: