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

removed stdio.h stdio.c

Browse Source
This commit is contained in:
hyung-hwan
2013-11-03 16:48:20 +00:00
parent 91c9182ad7
commit be129e743b
24 changed files with 258 additions and 964 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
qse/lib/awk/Makefile.am
View File

@ -12,7 +12,7 @@ LDFLAGS_ALL_COMMON = -L. -L../cmn -version-info 1:0:0 -no-undefined
CPPFLAGS_LIB_COMMON = $(CPPFLAGS_ALL_COMMON) $(LTDLINCL)
LDFLAGS_LIB_COMMON = $(LDFLAGS_ALL_COMMON)
LIBADD_LIB_COMMON = -lqsecmn $(LIBM) $(LIBLTDL)
LIBADD_LIB_COMMON = -lqsecmn $(LIBM) $(LIBLTDL)
if WIN32
# you must adjust the value of DEFAULT_MODPOSTFIX according
@ -33,7 +33,7 @@ lib_LTLIBRARIES += libqseawkxx.la
libqseawkxx_la_SOURCES = Awk.cpp StdAwk.cpp
libqseawkxx_la_CPPFLAGS = $(CPPFLAGS_LIB_COMMON)
libqseawkxx_la_LDFLAGS = $(LDFLAGS_LIB_COMMON)
libqseawkxx_la_LIBADD = -lqseawk -lqsecmnxx $(LIBADD_LIB_COMMON)
libqseawkxx_la_LIBADD = -lqseawk -lqsecmnxx -lqseawk -lqsecmn $(LIBADD_LIB_COMMON)
endif
if ENABLE_STATIC_MODULE

4
qse/lib/awk/Makefile.in
View File

@ -440,7 +440,7 @@ LDFLAGS_ALL_COMMON = -L. -L../cmn -version-info 1:0:0 -no-undefined
CPPFLAGS_LIB_COMMON = $(CPPFLAGS_ALL_COMMON) $(LTDLINCL) \
$(am__append_1) $(am__append_2)
LDFLAGS_LIB_COMMON = $(LDFLAGS_ALL_COMMON)
LIBADD_LIB_COMMON = -lqsecmn $(LIBM) $(LIBLTDL)
LIBADD_LIB_COMMON = -lqsecmn $(LIBM) $(LIBLTDL)
lib_LTLIBRARIES = libqseawk.la $(am__append_3)
libqseawk_la_SOURCES = awk.c err.c tree.c parse.c run.c rec.c val.c \
fnc.c misc.c rio.c std.c awk.h err.h rio.h val.h fnc.h misc.h \
@ -452,7 +452,7 @@ libqseawk_la_LIBADD = $(LIBADD_LIB_COMMON) $(am__append_9)
@ENABLE_CXX_TRUE@libqseawkxx_la_SOURCES = Awk.cpp StdAwk.cpp
@ENABLE_CXX_TRUE@libqseawkxx_la_CPPFLAGS = $(CPPFLAGS_LIB_COMMON)
@ENABLE_CXX_TRUE@libqseawkxx_la_LDFLAGS = $(LDFLAGS_LIB_COMMON)
@ENABLE_CXX_TRUE@libqseawkxx_la_LIBADD = -lqseawk -lqsecmnxx $(LIBADD_LIB_COMMON)
@ENABLE_CXX_TRUE@libqseawkxx_la_LIBADD = -lqseawk -lqsecmnxx -lqseawk -lqsecmn $(LIBADD_LIB_COMMON)
##################################################
# DYNAMIC MODULES

1
qse/lib/awk/StdAwk.cpp
View File

@ -27,7 +27,6 @@
#include <qse/cmn/nwio.h>
#include <qse/cmn/path.h>
#include <qse/cmn/alg.h>
#include <qse/cmn/stdio.h>
#include "awk.h"
#include <stdlib.h>

1
qse/lib/cmn/Makefile.am
View File

@ -73,7 +73,6 @@ libqsecmn_la_SOURCES = \
sio.c \
sll.c \
slmb.c \
stdio.c \
str-beg.c \
str-cat.c \
str-chr.c \

57
qse/lib/cmn/Makefile.in
View File

@ -92,15 +92,15 @@ am__libqsecmn_la_SOURCES_DIST = alg-base64.c alg-rand.c alg-search.c \
hton.c ipad.c lda.c main.c mb8.c mbwc.c mbwc-str.c mem.c mux.c \
nwad.c nwad-skad.c nwif.c nwif-cfg.c nwio.c oht.c opt.c \
path-basename.c path-canon.c pio.c pma.c rbt.c rex.c sio.c \
sll.c slmb.c stdio.c str-beg.c str-cat.c str-chr.c str-cnv.c \
str-cmp.c str-cpy.c str-del.c str-dup.c str-dyn.c str-end.c \
str-excl.c str-fcpy.c str-fmt.c str-fnmat.c str-incl.c \
str-join.c str-len.c str-pac.c str-pbrk.c str-put.c str-rev.c \
str-rot.c str-set.c str-spl.c str-spn.c str-str.c str-subst.c \
str-tok.c str-trm.c str-word.c task.c time.c tio.c tre.c \
tre-ast.c tre-compile.c tre-match-backtrack.c \
tre-match-parallel.c tre-parse.c tre-stack.c uri.c utf8.c \
xma.c uni.c cp949.c cp950.c
sll.c slmb.c str-beg.c str-cat.c str-chr.c str-cnv.c str-cmp.c \
str-cpy.c str-del.c str-dup.c str-dyn.c str-end.c str-excl.c \
str-fcpy.c str-fmt.c str-fnmat.c str-incl.c str-join.c \
str-len.c str-pac.c str-pbrk.c str-put.c str-rev.c str-rot.c \
str-set.c str-spl.c str-spn.c str-str.c str-subst.c str-tok.c \
str-trm.c str-word.c task.c time.c tio.c tre.c tre-ast.c \
tre-compile.c tre-match-backtrack.c tre-match-parallel.c \
tre-parse.c tre-stack.c uri.c utf8.c xma.c uni.c cp949.c \
cp950.c
@ENABLE_BUNDLED_UNICODE_TRUE@am__objects_1 = uni.lo
@ENABLE_XCMGRS_TRUE@am__objects_2 = cp949.lo cp950.lo
am_libqsecmn_la_OBJECTS = alg-base64.lo alg-rand.lo alg-search.lo \
@ -110,16 +110,16 @@ am_libqsecmn_la_OBJECTS = alg-base64.lo alg-rand.lo alg-search.lo \
mbwc.lo mbwc-str.lo mem.lo mux.lo nwad.lo nwad-skad.lo nwif.lo \
nwif-cfg.lo nwio.lo oht.lo opt.lo path-basename.lo \
path-canon.lo pio.lo pma.lo rbt.lo rex.lo sio.lo sll.lo \
slmb.lo stdio.lo str-beg.lo str-cat.lo str-chr.lo str-cnv.lo \
str-cmp.lo str-cpy.lo str-del.lo str-dup.lo str-dyn.lo \
str-end.lo str-excl.lo str-fcpy.lo str-fmt.lo str-fnmat.lo \
str-incl.lo str-join.lo str-len.lo str-pac.lo str-pbrk.lo \
str-put.lo str-rev.lo str-rot.lo str-set.lo str-spl.lo \
str-spn.lo str-str.lo str-subst.lo str-tok.lo str-trm.lo \
str-word.lo task.lo time.lo tio.lo tre.lo tre-ast.lo \
tre-compile.lo tre-match-backtrack.lo tre-match-parallel.lo \
tre-parse.lo tre-stack.lo uri.lo utf8.lo xma.lo \
$(am__objects_1) $(am__objects_2)
slmb.lo str-beg.lo str-cat.lo str-chr.lo str-cnv.lo str-cmp.lo \
str-cpy.lo str-del.lo str-dup.lo str-dyn.lo str-end.lo \
str-excl.lo str-fcpy.lo str-fmt.lo str-fnmat.lo str-incl.lo \
str-join.lo str-len.lo str-pac.lo str-pbrk.lo str-put.lo \
str-rev.lo str-rot.lo str-set.lo str-spl.lo str-spn.lo \
str-str.lo str-subst.lo str-tok.lo str-trm.lo str-word.lo \
task.lo time.lo tio.lo tre.lo tre-ast.lo tre-compile.lo \
tre-match-backtrack.lo tre-match-parallel.lo tre-parse.lo \
tre-stack.lo uri.lo utf8.lo xma.lo $(am__objects_1) \
$(am__objects_2)
libqsecmn_la_OBJECTS = $(am_libqsecmn_la_OBJECTS)
AM_V_lt = $(am__v_lt_@AM_V@)
am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
@ -394,15 +394,15 @@ libqsecmn_la_SOURCES = alg-base64.c alg-rand.c alg-search.c alg-sort.c \
ipad.c lda.c main.c mb8.c mbwc.c mbwc-str.c mem.c mux.c nwad.c \
nwad-skad.c nwif.c nwif-cfg.c nwio.c oht.c opt.c \
path-basename.c path-canon.c pio.c pma.c rbt.c rex.c sio.c \
sll.c slmb.c stdio.c str-beg.c str-cat.c str-chr.c str-cnv.c \
str-cmp.c str-cpy.c str-del.c str-dup.c str-dyn.c str-end.c \
str-excl.c str-fcpy.c str-fmt.c str-fnmat.c str-incl.c \
str-join.c str-len.c str-pac.c str-pbrk.c str-put.c str-rev.c \
str-rot.c str-set.c str-spl.c str-spn.c str-str.c str-subst.c \
str-tok.c str-trm.c str-word.c task.c time.c tio.c tre.c \
tre-ast.c tre-compile.c tre-match-backtrack.c \
tre-match-parallel.c tre-parse.c tre-stack.c uri.c utf8.c \
xma.c $(am__append_1) $(am__append_2)
sll.c slmb.c str-beg.c str-cat.c str-chr.c str-cnv.c str-cmp.c \
str-cpy.c str-del.c str-dup.c str-dyn.c str-end.c str-excl.c \
str-fcpy.c str-fmt.c str-fnmat.c str-incl.c str-join.c \
str-len.c str-pac.c str-pbrk.c str-put.c str-rev.c str-rot.c \
str-set.c str-spl.c str-spn.c str-str.c str-subst.c str-tok.c \
str-trm.c str-word.c task.c time.c tio.c tre.c tre-ast.c \
tre-compile.c tre-match-backtrack.c tre-match-parallel.c \
tre-parse.c tre-stack.c uri.c utf8.c xma.c $(am__append_1) \
$(am__append_2)
libqsecmn_la_LDFLAGS = -version-info 1:0:0 -no-undefined
libqsecmn_la_LIBADD = $(SOCKET_LIBS) $(QUADMATH_LIBS)
@ENABLE_CXX_TRUE@libqsecmnxx_la_SOURCES = \
@ -534,7 +534,6 @@ distclean-compile:
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sio.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sll.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/slmb.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/stdio.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/str-beg.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/str-cat.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/str-chr.Plo@am__quote@

608
qse/lib/cmn/stdio.c
View File

@ -1,608 +0,0 @@
/*
* $Id$
*
Copyright 2006-2012 Chung, Hyung-Hwan.
This file is part of QSE.
QSE is free software: you can redistribute it and/or modify
it under the terms of the GNU Lesser General Public License as
published by the Free Software Foundation, either version 3 of
the License, or (at your option) any later version.
QSE is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU Lesser General Public License for more details.
You should have received a copy of the GNU Lesser General Public
License along with QSE. If not, see <http://www.gnu.org/licenses/>.
*/
#include <qse/cmn/stdio.h>
#include <qse/cmn/chr.h>
#include <qse/cmn/mbwc.h>
#include "mem.h"
#include <stdio.h>
#if defined(__GLIBC__)
/* for vswprintf */
# define __USE_UNIX98
#endif
#include <wchar.h>
#include <stdlib.h>
#include <limits.h>
#if defined(_WIN32) && !defined(__WATCOMC__)
# include <tchar.h>
# define FGETC(x) _fgettc(x)
#elif defined(QSE_CHAR_IS_MCHAR)
# define FGETC(x) fgetc(x)
#else
# define FGETC(x) fgetwc(x)
#endif
#define STREAM_TO_FILE(stream) \
((stream == QSE_STDOUT)? stdout: \
(stream == QSE_STDERR)? stderr: \
(stream == QSE_STDIN)? stdin: (FILE*)stream)
static qse_char_t* __adjust_format (const qse_char_t* format);
int qse_vfprintf (QSE_FILE *stream, const qse_char_t* fmt, va_list ap)
{
int n;
qse_char_t* nf;
FILE* fp;
nf = __adjust_format (fmt);
if (nf == QSE_NULL) return -1;
fp = STREAM_TO_FILE (stream);
#if defined(QSE_CHAR_IS_MCHAR)
n = vfprintf (fp, nf, ap);
#else
n = vfwprintf (fp, nf, ap);
#endif
QSE_MMGR_FREE (QSE_MMGR_GETDFL(), nf);
return n;
}
int qse_vprintf (const qse_char_t* fmt, va_list ap)
{
int n;
qse_char_t* nf;
nf = __adjust_format (fmt);
if (nf == QSE_NULL) return -1;
#if defined(QSE_CHAR_IS_MCHAR)
n = vfprintf (stdout, nf, ap);
#else
n = vfwprintf (stdout, nf, ap);
#endif
QSE_MMGR_FREE (QSE_MMGR_GETDFL(), nf);
return n;
}
int qse_fprintf (QSE_FILE* stream, const qse_char_t* fmt, ...)
{
int n;
va_list ap;
qse_char_t* nf;
FILE* fp;
nf = __adjust_format (fmt);
if (nf == QSE_NULL) return -1;
fp = STREAM_TO_FILE (stream);
va_start (ap, fmt);
#if defined(QSE_CHAR_IS_MCHAR)
n = vfprintf (fp, nf, ap);
#else
n = vfwprintf (fp, nf, ap);
#endif
va_end (ap);
QSE_MMGR_FREE (QSE_MMGR_GETDFL(), nf);
return n;
}
int qse_printf (const qse_char_t* fmt, ...)
{
int n;
va_list ap;
qse_char_t* nf;
nf = __adjust_format (fmt);
if (nf == QSE_NULL) return -1;
va_start (ap, fmt);
#if defined(QSE_CHAR_IS_MCHAR)
n = vfprintf (stdout, nf, ap);
#else
n = vfwprintf (stdout, nf, ap);
#endif
va_end (ap);
QSE_MMGR_FREE (QSE_MMGR_GETDFL(), nf);
return n;
}
int qse_dprintf (const qse_char_t* fmt, ...)
{
int n;
va_list ap;
qse_char_t* nf;
nf = __adjust_format (fmt);
if (nf == QSE_NULL) return -1;
va_start (ap, fmt);
#if defined(QSE_CHAR_IS_MCHAR)
n = vfprintf (stderr, nf, ap);
#else
n = vfwprintf (stderr, nf, ap);
#endif
va_end (ap);
QSE_MMGR_FREE (QSE_MMGR_GETDFL(), nf);
return n;
}
int qse_vsprintf (qse_char_t* buf, qse_size_t size, const qse_char_t* fmt, va_list ap)
{
int n;
qse_char_t* nf = __adjust_format (fmt);
if (nf == QSE_NULL) return -1;
#if defined(QSE_CHAR_IS_MCHAR)
#if defined(_MSC_VER) || defined(__BORLANDC__) || (defined(__WATCOMC__) && (__WATCOMC__ < 1200)) || defined(HAVE__VSNPRINTF)
n = _vsnprintf (buf, size, nf, ap);
#else
n = vsnprintf (buf, size, nf, ap);
#endif
#else
#if defined(_MSC_VER) || defined(__BORLANDC__) || (defined(__WATCOMC__) && (__WATCOMC__ < 1200)) || defined(HAVE__VSNWPRINTF)
n = _vsnwprintf (buf, size, nf, ap);
#else
n = vswprintf (buf, size, nf, ap);
#endif
#endif
if (n < 0 || (size_t)n >= size)
{
if (size > 0) buf[size-1] = QSE_T('\0');
n = -1;
}
QSE_MMGR_FREE (QSE_MMGR_GETDFL(), nf);
return n;
}
int qse_sprintf (qse_char_t* buf, qse_size_t size, const qse_char_t* fmt, ...)
{
int n;
va_list ap;
va_start (ap, fmt);
n = qse_vsprintf (buf, size, fmt, ap);
va_end (ap);
return n;
}
#define MOD_SHORT 1
#define MOD_LONG 2
#define MOD_LONGLONG 3
#define ADDC(buf,c) \
do { \
if (buf.len >= buf.cap) \
{ \
qse_char_t* tmp; \
tmp = (qse_char_t*) QSE_MMGR_REALLOC ( \
QSE_MMGR_GETDFL(), buf.ptr, \
QSE_SIZEOF(qse_char_t) * (buf.cap+256+1)); \
if (tmp == QSE_NULL) \
{ \
QSE_MMGR_FREE (QSE_MMGR_GETDFL(), buf.ptr); \
return QSE_NULL; \
} \
buf.ptr = tmp; \
buf.cap = buf.cap + 256; \
} \
buf.ptr[buf.len++] = c; \
} while (0)
static qse_char_t* __adjust_format (const qse_char_t* format)
{
const qse_char_t* fp = format;
int modifier;
qse_char_t ch;
struct
{
qse_char_t* ptr;
qse_size_t len;
qse_size_t cap;
} buf;
buf.len = 0;
buf.cap = 256;
buf.ptr = (qse_char_t*) QSE_MMGR_ALLOC (
QSE_MMGR_GETDFL(), QSE_SIZEOF(qse_char_t) * (buf.cap+1));
if (buf.ptr == QSE_NULL) return QSE_NULL;
while (*fp != QSE_T('\0'))
{
while (*fp != QSE_T('\0') && *fp != QSE_T('%'))
{
ADDC (buf, *fp++);
}
if (*fp == QSE_T('\0')) break;
ch = *fp++;
ADDC (buf, ch); /* add % */
ch = *fp++;
/* flags */
while (1)
{
if (ch == QSE_T(' ') || ch == QSE_T('+') ||
ch == QSE_T('-') || ch == QSE_T('#'))
{
ADDC (buf, ch);
ch = *fp++;
}
else
{
if (ch == QSE_T('0'))
{
ADDC (buf, ch);
ch = *fp++;
}
break;
}
}
/* check the width */
if (ch == QSE_T('*'))
{
ADDC (buf, ch);
ch = *fp++;
}
else
{
while (QSE_ISDIGIT(ch))
{
ADDC (buf, ch);
ch = *fp++;
}
}
/* precision */
if (ch == QSE_T('.'))
{
ADDC (buf, ch);
ch = *fp++;
if (ch == QSE_T('*'))
{
ADDC (buf, ch);
ch = *fp++;
}
else
{
while (QSE_ISDIGIT(ch))
{
ADDC (buf, ch);
ch = *fp++;
}
}
}
/* modifier */
for (modifier = 0;;)
{
if (ch == QSE_T('h')) modifier = MOD_SHORT;
else if (ch == QSE_T('l'))
{
modifier = (modifier == MOD_LONG)? MOD_LONGLONG: MOD_LONG;
}
else break;
ch = *fp++;
}
/* type */
switch (ch)
{
case QSE_T('\0'):
goto done;
case QSE_T('%'):
{
ADDC (buf, ch);
break;
}
case QSE_T('c'):
case QSE_T('s'):
{
if (modifier == MOD_SHORT)
{
/* always multibyte */
#if defined(QSE_CHAR_IS_MCHAR)
goto mchar_multi;
#else
ch = QSE_TOUPPER(ch);
goto wchar_multi;
#endif
}
else if (modifier == MOD_LONG)
{
/* always wide-character */
#if defined(QSE_CHAR_IS_MCHAR)
ch = QSE_TOUPPER(ch);
goto mchar_wide;
#else
goto wchar_wide;
#endif
}
else
{
#if defined(QSE_CHAR_IS_MCHAR)
mchar_multi:
#if defined(_WIN32) && !defined(__WATCOMC__)
ADDC (buf, ch);
#else
ADDC (buf, ch);
#endif
#else
wchar_wide:
#if defined(_WIN32) && !defined(__WATCOMC__)
ADDC (buf, ch);
#else
ADDC (buf, QSE_WT('l'));
ADDC (buf, ch);
#endif
#endif
}
break;
}
case QSE_T('C'):
case QSE_T('S'):
{
#if defined(QSE_CHAR_IS_MCHAR)
mchar_wide:
#if defined(_WIN32) && !defined(__WATCOMC__)
ADDC (buf, ch);
#else
ADDC (buf, QSE_MT('l'));
ADDC (buf, QSE_TOLOWER(ch));
#endif
#else
wchar_multi:
#if defined(_WIN32) && !defined(__WATCOMC__)
ADDC (buf, ch);
#else
ADDC (buf, QSE_MT('h'));
ADDC (buf, QSE_TOLOWER(ch));
#endif
#endif
break;
}
case QSE_T('d'):
case QSE_T('i'):
case QSE_T('o'):
case QSE_T('u'):
case QSE_T('x'):
case QSE_T('X'):
{
if (modifier == MOD_SHORT)
{
ADDC (buf, 'h');
}
else if (modifier == MOD_LONG)
{
ADDC (buf, 'l');
}
else if (modifier == MOD_LONGLONG)
{
#if defined(_WIN32) && !defined(__LCC__)
ADDC (buf, 'I');
ADDC (buf, '6');
ADDC (buf, '4');
#else
ADDC (buf, 'l');
ADDC (buf, 'l');
#endif
}
ADDC (buf, ch);
break;
}
default:
{
ADDC (buf, ch);
break;
}
}
}
done:
buf.ptr[buf.len] = QSE_T('\0');
return buf.ptr;
}
QSE_FILE* qse_fopen (const qse_char_t* path, const qse_char_t* mode)
{
#if defined(QSE_CHAR_IS_MCHAR)
return (QSE_FILE*)fopen (path, mode);
#elif defined(_WIN32) || defined(__OS2__)
return (QSE_FILE*)_wfopen (path, mode);
#else
FILE* fp = QSE_NULL;
qse_mchar_t* path_mb;
qse_mchar_t* mode_mb;
path_mb = qse_wcstombsdup (path, QSE_NULL, QSE_MMGR_GETDFL());
mode_mb = qse_wcstombsdup (mode, QSE_NULL, QSE_MMGR_GETDFL());
if (path_mb && mode_mb)
{
fp = fopen (path_mb, mode_mb);
}
if (mode_mb) QSE_MMGR_FREE (QSE_MMGR_GETDFL(), mode_mb);
if (path_mb) QSE_MMGR_FREE (QSE_MMGR_GETDFL(), path_mb);
return (QSE_FILE*)fp;
#endif
}
void qse_fclose (QSE_FILE* stream)
{
FILE* fp;
fp = STREAM_TO_FILE (stream);
fclose (fp);
}
int qse_fflush (QSE_FILE* stream)
{
FILE* fp;
fp = STREAM_TO_FILE (stream);
return fflush (fp);
}
void qse_clearerr (QSE_FILE* stream)
{
FILE* fp;
fp = STREAM_TO_FILE (stream);
clearerr (fp);
}
int qse_feof (QSE_FILE* stream)
{
FILE* fp;
fp = STREAM_TO_FILE (stream);
return feof (fp);
}
int qse_ferror (QSE_FILE* stream)
{
FILE* fp;
fp = STREAM_TO_FILE (stream);
return ferror (fp);
}
static int isnl (const qse_char_t* ptr, qse_size_t len, void* delim)
{
return (ptr[len-1] == *(qse_char_t*)delim)? 1: 0;
}
qse_ssize_t qse_getline (qse_char_t **buf, qse_size_t *n, QSE_FILE *stream)
{
qse_char_t nl = QSE_T('\n');
return qse_getdelim (buf, n, isnl, &nl, stream);
}
qse_ssize_t qse_getdelim (
qse_char_t **buf, qse_size_t *n,
qse_getdelim_t fn, void* fnarg, QSE_FILE *stream)
{
qse_char_t* b;
qse_size_t capa;
qse_size_t len = 0;
int x;
FILE* fp;
QSE_ASSERT (buf != QSE_NULL);
QSE_ASSERT (n != QSE_NULL);
fp = STREAM_TO_FILE (stream);
b = *buf;
capa = *n;
if (b == QSE_NULL)
{
capa = 256;
b = (qse_char_t*) QSE_MMGR_ALLOC (
QSE_MMGR_GETDFL(), QSE_SIZEOF(qse_char_t)*(capa+1));
if (b == QSE_NULL) return -2;
}
if (feof(fp))
{
len = (qse_size_t)-1;
goto exit_task;
}
while (1)
{
qse_cint_t c = FGETC (fp);
if (c == QSE_CHAR_EOF)
{
if (ferror(fp))
{
len = (qse_size_t)-2;
goto exit_task;
}
if (len == 0)
{
len = (qse_size_t)-1;
goto exit_task;
}
break;
}
if (len+1 >= capa)
{
qse_size_t ncapa = capa + 256;
qse_char_t* nb;
nb = QSE_MMGR_REALLOC (
QSE_MMGR_GETDFL(), b, ncapa * QSE_SIZEOF(qse_char_t));
if (nb == QSE_NULL)
{
len = (qse_size_t)-2;
goto exit_task;
}
b = nb;
capa = ncapa;
}
b[len++] = c;
x = fn (b, len, fnarg);
if (x < 0)
{
len = (qse_size_t)-3;
goto exit_task;
}
if (x > 0) break;
}
b[len] = QSE_T('\0');
exit_task:
*buf = b;
*n = capa;
return (qse_ssize_t)len;
}

3
qse/lib/http/httpd.c
View File

@ -23,8 +23,7 @@
#include <qse/cmn/chr.h>
#include <qse/cmn/str.h>
#include <qse/cmn/mbwc.h>
#include <qse/cmn/stdio.h>
#include <qse/cmn/sio.h>
typedef struct htrd_xtn_t htrd_xtn_t;

2
qse/lib/http/httpd.h
View File

@ -25,8 +25,6 @@
#include <qse/http/httpd.h>
#include <qse/cmn/stdio.h> /* TODO: remove this.. only for debugging at this moment */
struct qse_httpd_t
{
qse_mmgr_t* mmgr;