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-03-19 02:02:12 +00:00
parent 2a753d8e07
commit 0f64014c97
2 changed files with 40 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
ase/utl/stdio.c
View File

@ -1,5 +1,5 @@
/* /*
* $Id: stdio.c 130 2008-03-13 05:53:06Z baconevi $ * $Id: stdio.c 146 2008-03-18 08:02:12Z baconevi $
* *
* {License} * {License}
*/ */
@ -46,7 +46,7 @@ int ase_sprintf (ase_char_t* buf, size_t size, const ase_char_t* fmt, ...)
static ase_char_t* __adjust_format (const ase_char_t* format); static ase_char_t* __adjust_format (const ase_char_t* format);
int ase_vfprintf (FILE *stream, const ase_char_t* fmt, va_list ap) int ase_vfprintf (ASE_FILE *stream, const ase_char_t* fmt, va_list ap)
{ {
int n; int n;
ase_char_t* nf = __adjust_format (fmt); ase_char_t* nf = __adjust_format (fmt);
@ -66,7 +66,7 @@ int ase_vprintf (const ase_char_t* fmt, va_list ap)
return ase_vfprintf (stdout, fmt, ap); return ase_vfprintf (stdout, fmt, ap);
} }
int ase_fprintf (FILE* file, const ase_char_t* fmt, ...) int ase_fprintf (ASE_FILE* file, const ase_char_t* fmt, ...)
{ {
int n; int n;
va_list ap; va_list ap;
@ -317,7 +317,7 @@ int ase_dprintf (const ase_char_t* fmt, ...)
return n; return n;
} }
FILE* ase_fopen (const ase_char_t* path, const ase_char_t* mode) ASE_FILE* ase_fopen (const ase_char_t* path, const ase_char_t* mode)
{ {
#if defined(_WIN32) #if defined(_WIN32)
return _tfopen (path, mode); return _tfopen (path, mode);
@ -341,7 +341,7 @@ FILE* ase_fopen (const ase_char_t* path, const ase_char_t* mode)
#endif #endif
} }
FILE* ase_popen (const ase_char_t* cmd, const ase_char_t* mode) ASE_FILE* ase_popen (const ase_char_t* cmd, const ase_char_t* mode)
{ {
#if defined(__SPU__) #if defined(__SPU__)
/* popen is not available */ /* popen is not available */
@ -375,17 +375,26 @@ FILE* ase_popen (const ase_char_t* cmd, const ase_char_t* mode)
#endif #endif
} }
ase_ssize_t ase_getline (ase_char_t **buf, ase_size_t *n, FILE *fp) static int isnl (ase_char_t* ptr, ase_size_t len, void* delim)
{ {
return ase_getdelim (buf, n, ASE_T('\n'), fp); return (ptr[len-1] == *(ase_char_t*)delim)? 1: 0;
}
ase_ssize_t ase_getline (ase_char_t **buf, ase_size_t *n, ASE_FILE *fp)
{
ase_char_t nl = ASE_T('\n');
return ase_getdelim (buf, n, isnl, &nl, fp);
} }
ase_ssize_t ase_getdelim ( ase_ssize_t ase_getdelim (
ase_char_t **buf, ase_size_t *n, ase_char_t delim, FILE *fp) ase_char_t **buf, ase_size_t *n,
int (*break_line)(ase_char_t*,ase_size_t,void*),
void* delim, ASE_FILE *fp)
{ {
ase_char_t* b; ase_char_t* b;
ase_size_t capa; ase_size_t capa;
ase_size_t len = 0; ase_size_t len = 0;
int x;
ASE_ASSERT (buf != ASE_NULL); ASE_ASSERT (buf != ASE_NULL);
ASE_ASSERT (n != ASE_NULL); ASE_ASSERT (n != ASE_NULL);
@ -446,7 +455,14 @@ ase_ssize_t ase_getdelim (
} }
b[len++] = c; b[len++] = c;
if (c == delim) break;
x = break_line (b, len, delim);
if (x < 0)
{
len = (ase_size_t)-3;
goto exit_task;
}
if (x > 0) break;
} }
b[len] = ASE_T('\0'); b[len] = ASE_T('\0');

22
ase/utl/stdio.h
View File

@ -1,5 +1,5 @@
/* /*
* $Id: stdio.h 132 2008-03-17 10:27:02Z baconevi $ * $Id: stdio.h 146 2008-03-18 08:02:12Z baconevi $
* *
* {License} * {License}
*/ */
@ -44,6 +44,7 @@
#define ase_fflush(s) fflush(s) #define ase_fflush(s) fflush(s)
#define ase_fclose(s) fclose(s) #define ase_fclose(s) fclose(s)
#define ASE_FILE FILE
#define ASE_STDIN stdin #define ASE_STDIN stdin
#define ASE_STDOUT stdout #define ASE_STDOUT stdout
#define ASE_STDERR stderr #define ASE_STDERR stderr
@ -56,22 +57,29 @@ int ase_vsprintf (ase_char_t* buf, size_t size, const ase_char_t* fmt, va_list a
int ase_sprintf (ase_char_t* buf, size_t size, const ase_char_t* fmt, ...); int ase_sprintf (ase_char_t* buf, size_t size, const ase_char_t* fmt, ...);
#if !defined(_WIN32) #if !defined(_WIN32)
int ase_vfprintf (FILE *stream, const ase_char_t* fmt, va_list ap); int ase_vfprintf (ASE_FILE *stream, const ase_char_t* fmt, va_list ap);
int ase_vprintf (const ase_char_t* fmt, va_list ap); int ase_vprintf (const ase_char_t* fmt, va_list ap);
int ase_fprintf (FILE* file, const ase_char_t* fmt, ...); int ase_fprintf (ASE_FILE* file, const ase_char_t* fmt, ...);
int ase_printf (const ase_char_t* fmt, ...); int ase_printf (const ase_char_t* fmt, ...);
#endif #endif
int ase_dprintf (const ase_char_t* fmt, ...); int ase_dprintf (const ase_char_t* fmt, ...);
FILE* ase_fopen (const ase_char_t* path, const ase_char_t* mode); ASE_FILE* ase_fopen (const ase_char_t* path, const ase_char_t* mode);
FILE* ase_popen (const ase_char_t* cmd, const ase_char_t* mode); ASE_FILE* ase_popen (const ase_char_t* cmd, const ase_char_t* mode);
/** /**
* returns -2 on error, -1 on eof, length of data read on success * returns -2 on error, -1 on eof, length of data read on success
*/ */
ase_ssize_t ase_getline (ase_char_t **buf, ase_size_t *n, FILE *fp); ase_ssize_t ase_getline (ase_char_t **buf, ase_size_t *n, ASE_FILE *fp);
/**
* returns -3 on line breaker error, -2 on error, -1 on eof,
* length of data read on success
*/
ase_ssize_t ase_getdelim ( ase_ssize_t ase_getdelim (
ase_char_t **buf, ase_size_t *n, ase_char_t delim, FILE *fp); ase_char_t **buf, ase_size_t *n,
int (*break_line)(ase_char_t*,ase_size_t,void*),
void* delim, ASE_FILE *fp);
#ifdef __cplusplus #ifdef __cplusplus
} }