Return-Path: Delivered-To: apmail-httpd-dev-archive@httpd.apache.org Received: (qmail 17279 invoked by uid 500); 5 Mar 2002 13:45:17 -0000 Mailing-List: contact dev-help@httpd.apache.org; run by ezmlm Precedence: bulk Reply-To: dev@httpd.apache.org list-help: list-unsubscribe: list-post: Delivered-To: mailing list dev@httpd.apache.org Received: (qmail 17259 invoked from network); 5 Mar 2002 13:45:17 -0000 From: "Sander Striker" To: Subject: [PATCH] server/gen_test_char.c detab Date: Tue, 5 Mar 2002 14:49:59 +0100 Message-ID: MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="----=_NextPart_000_0383_01C1C455.060946A0" X-Priority: 3 (Normal) X-MSMail-Priority: Normal X-Mailer: Microsoft Outlook IMO, Build 9.0.2416 (9.0.2911.0) X-MimeOLE: Produced By Microsoft MimeOLE V5.50.4133.2400 Importance: Normal X-Rcpt-To: X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N This is a multi-part message in MIME format. ------=_NextPart_000_0383_01C1C455.060946A0 Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: 7bit Hi, Yet more detab. Patch attached. Sander ------=_NextPart_000_0383_01C1C455.060946A0 Content-Type: application/octet-stream; name="gen_test_char.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="gen_test_char.patch" Index: server/gen_test_char.c=0A= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=0A= RCS file: /home/cvspublic/httpd-2.0/server/gen_test_char.c,v=0A= retrieving revision 1.8=0A= diff -u -r1.8 gen_test_char.c=0A= --- server/gen_test_char.c 26 Dec 2001 22:00:01 -0000 1.8=0A= +++ server/gen_test_char.c 5 Mar 2002 13:19:54 -0000=0A= @@ -69,58 +69,60 @@=0A= /* A bunch of functions in util.c scan strings looking for certain = characters.=0A= * To make that more efficient we encode a lookup table.=0A= */=0A= -#define T_ESCAPE_SHELL_CMD (0x01)=0A= -#define T_ESCAPE_PATH_SEGMENT (0x02)=0A= -#define T_OS_ESCAPE_PATH (0x04)=0A= -#define T_HTTP_TOKEN_STOP (0x08)=0A= +#define T_ESCAPE_SHELL_CMD (0x01)=0A= +#define T_ESCAPE_PATH_SEGMENT (0x02)=0A= +#define T_OS_ESCAPE_PATH (0x04)=0A= +#define T_HTTP_TOKEN_STOP (0x08)=0A= =0A= int main(int argc, char *argv[])=0A= {=0A= unsigned c;=0A= unsigned char flags;=0A= =0A= - printf(=0A= -"/* this file is automatically generated by gen_test_char, do not edit = */\n"=0A= -"#define T_ESCAPE_SHELL_CMD (%u)\n"=0A= -"#define T_ESCAPE_PATH_SEGMENT (%u)\n"=0A= -"#define T_OS_ESCAPE_PATH (%u)\n"=0A= -"#define T_HTTP_TOKEN_STOP (%u)\n"=0A= -"\n"=0A= -"static const unsigned char test_char_table[256] =3D {\n"=0A= -" 0,",=0A= - T_ESCAPE_SHELL_CMD,=0A= - T_ESCAPE_PATH_SEGMENT,=0A= - T_OS_ESCAPE_PATH,=0A= - T_HTTP_TOKEN_STOP);=0A= + printf("/* this file is automatically generated by gen_test_char, "=0A= + "do not edit */\n"=0A= + "#define T_ESCAPE_SHELL_CMD (%u)\n"=0A= + "#define T_ESCAPE_PATH_SEGMENT (%u)\n"=0A= + "#define T_OS_ESCAPE_PATH (%u)\n"=0A= + "#define T_HTTP_TOKEN_STOP (%u)\n"=0A= + "\n"=0A= + "static const unsigned char test_char_table[256] =3D {\n"=0A= + " 0,",=0A= + T_ESCAPE_SHELL_CMD,=0A= + T_ESCAPE_PATH_SEGMENT,=0A= + T_OS_ESCAPE_PATH,=0A= + T_HTTP_TOKEN_STOP);=0A= =0A= /* we explicitly dealt with NUL above=0A= * in case some strchr() do bogosity with it */=0A= =0A= for (c =3D 1; c < 256; ++c) {=0A= - flags =3D 0;=0A= - if (c % 20 =3D=3D 0)=0A= - printf("\n ");=0A= -=0A= - /* escape_shell_cmd */=0A= - if (strchr("&;`'\"|*?~<>^()[]{}$\\\n", c)) {=0A= - flags |=3D T_ESCAPE_SHELL_CMD;=0A= - }=0A= -=0A= - if (!apr_isalnum(c) && !strchr("$-_.+!*'(),:@&=3D~", c)) {=0A= - flags |=3D T_ESCAPE_PATH_SEGMENT;=0A= - }=0A= -=0A= - if (!apr_isalnum(c) && !strchr("$-_.+!*'(),:@&=3D/~", c)) {=0A= - flags |=3D T_OS_ESCAPE_PATH;=0A= - }=0A= -=0A= - /* these are the "tspecials" from RFC2068 */=0A= - if (apr_iscntrl(c) || strchr(" \t()<>@,;:\\/[]?=3D{}", c)) {=0A= - flags |=3D T_HTTP_TOKEN_STOP;=0A= - }=0A= - printf("%u%c", flags, (c < 255) ? ',' : ' ');=0A= + flags =3D 0;=0A= + if (c % 20 =3D=3D 0)=0A= + printf("\n ");=0A= +=0A= + /* escape_shell_cmd */=0A= + if (strchr("&;`'\"|*?~<>^()[]{}$\\\n", c)) {=0A= + flags |=3D T_ESCAPE_SHELL_CMD;=0A= + }=0A= +=0A= + if (!apr_isalnum(c) && !strchr("$-_.+!*'(),:@&=3D~", c)) {=0A= + flags |=3D T_ESCAPE_PATH_SEGMENT;=0A= + }=0A= +=0A= + if (!apr_isalnum(c) && !strchr("$-_.+!*'(),:@&=3D/~", c)) {=0A= + flags |=3D T_OS_ESCAPE_PATH;=0A= + }=0A= +=0A= + /* these are the "tspecials" from RFC2068 */=0A= + if (apr_iscntrl(c) || strchr(" \t()<>@,;:\\/[]?=3D{}", c)) {=0A= + flags |=3D T_HTTP_TOKEN_STOP;=0A= + }=0A= +=0A= + printf("%u%c", flags, (c < 255) ? ',' : ' ');=0A= =0A= }=0A= +=0A= printf("\n};\n");=0A= =0A= return 0;=0A= ------=_NextPart_000_0383_01C1C455.060946A0--