hyung-hwan/qse
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Browse Source
This commit is contained in:
hyung-hwan
2008-08-21 04:58:19 +00:00
parent 6dbf01ade0
commit 713586d04a
14 changed files with 192 additions and 264 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
ase/lib/utl/http.c
View File

@ -1,19 +1,19 @@
/*
* $Id: http.c 332 2008-08-18 11:21:48Z baconevi $
* $Id: http.c 341 2008-08-20 10:58:19Z baconevi $
*
* {License}
*/
#include <ase/utl/http.h>
#include <ase/utl/ctype.h>
#include "../cmn/mem.h"
#include "../cmn/chr.h"
static int is_http_space (ase_char_t c)
{
return ase_isspace(c) && c != ASE_T('\r') && c != ASE_T('\n');
return ASE_ISSPACE(c) && c != ASE_T('\r') && c != ASE_T('\n');
}
#define is_http_ctl(c) ase_iscntrl(c)
#define is_http_ctl(c) ASE_ISCNTRL(c)
static int is_http_separator (ase_char_t c)
{
@ -40,7 +40,7 @@ static int is_http_separator (ase_char_t c)
static int is_http_token (ase_char_t c)
{
return ase_isprint(c) && !is_http_ctl(c) && !is_http_separator(c);
return ASE_ISPRINT(c) && !is_http_ctl(c) && !is_http_separator(c);
}
static int digit_to_num (ase_char_t c)
@ -59,10 +59,10 @@ ase_char_t* ase_parsehttpreq (ase_char_t* buf, ase_http_req_t* req)
while (is_http_space(*p)) p++;
/* the method should start with an alphabet */
if (!ase_isalpha(*p)) return ASE_NULL;
if (!ASE_ISALPHA(*p)) return ASE_NULL;
/* scan the method */
req->method = p; while (ase_isalpha(*p)) p++;
req->method = p; while (ASE_ISALPHA(*p)) p++;
/* the method should be followed by a space */
if (!is_http_space(*p)) return ASE_NULL;
@ -78,9 +78,9 @@ ase_char_t* ase_parsehttpreq (ase_char_t* buf, ase_http_req_t* req)
req->args.ptr = ASE_NULL;
x = p;
while (ase_isprint(*p) && !ase_isspace(*p))
while (ASE_ISPRINT(*p) && !ASE_ISSPACE(*p))
{
if (*p == ASE_T('%') && ase_isxdigit(*(p+1)) && ase_isxdigit(*(p+2)))
if (*p == ASE_T('%') && ASE_ISXDIGIT(*(p+1)) && ASE_ISXDIGIT(*(p+2)))
{
*x++ = (digit_to_num(*(p+1)) << 4) + digit_to_num(*(p+2));
p += 3;
@ -120,15 +120,15 @@ ase_char_t* ase_parsehttpreq (ase_char_t* buf, ase_http_req_t* req)
(p[3] == ASE_T('P') || p[3] == ASE_T('p')) &&
p[4] == ASE_T('/') && p[6] == ASE_T('.'))
{
if (!ase_isdigit(p[5])) return ASE_NULL;
if (!ase_isdigit(p[7])) return ASE_NULL;
if (!ASE_ISDIGIT(p[5])) return ASE_NULL;
if (!ASE_ISDIGIT(p[7])) return ASE_NULL;
req->vers.major = p[5] - ASE_T('0');
req->vers.minor = p[7] - ASE_T('0');
p += 8;
}
else return ASE_NULL;
while (ase_isspace(*p))
while (ASE_ISSPACE(*p))
{
if (*p++ == ASE_T('\n')) goto ok;
}
@ -147,7 +147,7 @@ ase_char_t* ase_parsehttphdr (ase_char_t* buf, ase_http_hdr_t* hdr)
ase_char_t* p = buf, * last;
/* ignore leading spaces including CR and NL */
while (ase_isspace(*p)) p++;
while (ASE_ISSPACE(*p)) p++;
if (*p == ASE_T('\0'))
{
@ -172,13 +172,13 @@ ase_char_t* ase_parsehttphdr (ase_char_t* buf, ase_http_hdr_t* hdr)
do { p++; } while (is_http_space(*p));
hdr->value.ptr = last = p;
while (ase_isprint(*p))
while (ASE_ISPRINT(*p))
{
if (!ase_isspace(*p++)) last = p;
if (!ASE_ISSPACE(*p++)) last = p;
}
hdr->value.len = last - hdr->value.ptr;
while (ase_isspace(*p))
while (ASE_ISSPACE(*p))
{
if (*p++ == ASE_T('\n')) goto ok;
}

7
ase/lib/utl/makefile.in
View File

@ -55,8 +55,7 @@ am__installdirs = "$(DESTDIR)$(libdir)"
libLTLIBRARIES_INSTALL = $(INSTALL)
LTLIBRARIES = $(lib_LTLIBRARIES)
libaseutl_la_LIBADD =
am_libaseutl_la_OBJECTS = helper.lo assert.lo ctype.lo getopt.lo \
http.lo main.lo stdio.lo
am_libaseutl_la_OBJECTS = assert.lo getopt.lo http.lo main.lo stdio.lo
libaseutl_la_OBJECTS = $(am_libaseutl_la_OBJECTS)
DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)/include/ase
depcomp = $(SHELL) $(top_srcdir)/autoconf/depcomp
@ -194,7 +193,7 @@ sysconfdir = @sysconfdir@
target_alias = @target_alias@
AM_CFLAGS = -I$(top_builddir)/include
lib_LTLIBRARIES = libaseutl.la
libaseutl_la_SOURCES = helper.c assert.c ctype.c getopt.c http.c main.c stdio.c
libaseutl_la_SOURCES = assert.c getopt.c http.c main.c stdio.c
libaseutl_la_LDFLAGS = -version-info 1:0:0
all: all-am
@ -266,9 +265,7 @@ distclean-compile:
-rm -f *.tab.c
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/assert.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ctype.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/getopt.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/helper.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/http.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/main.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/stdio.Plo@am__quote@

10
ase/lib/utl/stdio.c
View File

@ -1,11 +1,11 @@
/*
* $Id: stdio.c 149 2008-03-20 09:49:53Z baconevi $
* $Id: stdio.c 341 2008-08-20 10:58:19Z baconevi $
*
* {License}
*/
#include <ase/utl/stdio.h>
#include <ase/utl/ctype.h>
#include "../cmn/chr.h"
#include <wchar.h>
#include <stdlib.h>
@ -209,7 +209,7 @@ static ase_char_t* __adjust_format (const ase_char_t* format)
}
else
{
while (ase_isdigit(ch))
while (ASE_ISDIGIT(ch))
{
ADDC (buf, ch);
ch = *fp++;
@ -229,7 +229,7 @@ static ase_char_t* __adjust_format (const ase_char_t* format)
}
else
{
while (ase_isdigit(ch))
while (ASE_ISDIGIT(ch))
{
ADDC (buf, ch);
ch = *fp++;
@ -267,7 +267,7 @@ static ase_char_t* __adjust_format (const ase_char_t* format)
#ifdef ASE_CHAR_IS_MCHAR
ADDC (buf, 'l');
#endif
ADDC (buf, ase_tolower(ch));
ADDC (buf, ASE_TOLOWER(ch));
#endif
}
else if (ch == ASE_T('d') || ch == ASE_T('i') ||