added more checks to cgi handling
This commit is contained in:
		| @ -4,6 +4,7 @@ pkginclude_HEADERS = \ | ||||
| 	alg.h \ | ||||
| 	chr.h \ | ||||
| 	dll.h \ | ||||
| 	env.h \ | ||||
| 	fio.h \ | ||||
| 	fma.h \ | ||||
| 	gdl.h \ | ||||
|  | ||||
| @ -50,9 +50,9 @@ CONFIG_CLEAN_FILES = | ||||
| CONFIG_CLEAN_VPATH_FILES = | ||||
| SOURCES = | ||||
| DIST_SOURCES = | ||||
| am__pkginclude_HEADERS_DIST = alg.h chr.h dll.h fio.h fma.h gdl.h \ | ||||
| 	htb.h lda.h main.h map.h mem.h misc.h oht.h opt.h pio.h pma.h \ | ||||
| 	rbt.h rex.h sio.h sll.h stdio.h str.h time.h tio.h xma.h \ | ||||
| am__pkginclude_HEADERS_DIST = alg.h chr.h dll.h env.h fio.h fma.h \ | ||||
| 	gdl.h htb.h lda.h main.h map.h mem.h misc.h oht.h opt.h pio.h \ | ||||
| 	pma.h rbt.h rex.h sio.h sll.h stdio.h str.h time.h tio.h xma.h \ | ||||
| 	Mmgr.hpp StdMmgr.hpp Mmged.hpp | ||||
| am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; | ||||
| am__vpath_adj = case $$p in \ | ||||
| @ -222,9 +222,10 @@ target_alias = @target_alias@ | ||||
| top_build_prefix = @top_build_prefix@ | ||||
| top_builddir = @top_builddir@ | ||||
| top_srcdir = @top_srcdir@ | ||||
| pkginclude_HEADERS = alg.h chr.h dll.h fio.h fma.h gdl.h htb.h lda.h \ | ||||
| 	main.h map.h mem.h misc.h oht.h opt.h pio.h pma.h rbt.h rex.h \ | ||||
| 	sio.h sll.h stdio.h str.h time.h tio.h xma.h $(am__append_1) | ||||
| pkginclude_HEADERS = alg.h chr.h dll.h env.h fio.h fma.h gdl.h htb.h \ | ||||
| 	lda.h main.h map.h mem.h misc.h oht.h opt.h pio.h pma.h rbt.h \ | ||||
| 	rex.h sio.h sll.h stdio.h str.h time.h tio.h xma.h \ | ||||
| 	$(am__append_1) | ||||
| all: all-am | ||||
|  | ||||
| .SUFFIXES: | ||||
|  | ||||
							
								
								
									
										88
									
								
								qse/include/qse/cmn/env.h
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										88
									
								
								qse/include/qse/cmn/env.h
									
									
									
									
									
										Normal file
									
								
							| @ -0,0 +1,88 @@ | ||||
| /* | ||||
|  * $Id: pio.h 455 2011-05-09 16:11:13Z hyunghwan.chung $ | ||||
|  * | ||||
|     Copyright 2006-2011 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/>. | ||||
|  */ | ||||
|  | ||||
| #ifndef _QSE_CMN_ENV_H_ | ||||
| #define _QSE_CMN_ENV_H_ | ||||
|  | ||||
| #include <qse/types.h> | ||||
| #include <qse/macros.h> | ||||
|  | ||||
| typedef struct qse_env_t qse_env_t; | ||||
|  | ||||
| struct qse_env_t | ||||
| { | ||||
| 	QSE_DEFINE_COMMON_FIELDS(pio) | ||||
|  | ||||
| 	struct | ||||
| 	{ | ||||
| 		qse_size_t  capa; | ||||
| 		qse_size_t  len; | ||||
| 		void*       ptr; | ||||
| 	} buf; | ||||
|  | ||||
| 	struct | ||||
| 	{ | ||||
| 		qse_size_t  capa; | ||||
| 		qse_size_t  len; | ||||
| 		void**      ptr; | ||||
| 	} arr; | ||||
| }; | ||||
|  | ||||
|  | ||||
| #ifdef __cplusplus | ||||
| extern "C" { | ||||
| #endif | ||||
|  | ||||
| QSE_DEFINE_COMMON_FUNCTIONS(env) | ||||
|  | ||||
| qse_env_t* qse_env_open ( | ||||
| 	qse_mmgr_t* mmgr, | ||||
| 	qse_size_t  xtnsize | ||||
| ); | ||||
|  | ||||
| void qse_env_close ( | ||||
| 	qse_env_t* env | ||||
| ); | ||||
|  | ||||
| qse_env_t* qse_env_init ( | ||||
| 	qse_env_t*  env, | ||||
| 	qse_mmgr_t* mmgr | ||||
| ); | ||||
|  | ||||
| void qse_env_fini ( | ||||
| 	qse_env_t* env | ||||
| ); | ||||
|  | ||||
| /* | ||||
| void* qse_env_getstring (); | ||||
| void* qse_env_getarray (); | ||||
| */ | ||||
|  | ||||
| int qse_env_add ( | ||||
| 	qse_env_t*  env, | ||||
| 	const void* name, | ||||
| 	const void* value | ||||
| ); | ||||
|  | ||||
| #ifdef __cplusplus | ||||
| } | ||||
| #endif | ||||
|  | ||||
| #endif | ||||
| @ -1,5 +1,5 @@ | ||||
| /* | ||||
|  * $Id: pio.h 455 2011-05-09 16:11:13Z hyunghwan.chung $ | ||||
|  * $Id: pio.h 533 2011-08-04 15:43:28Z hyunghwan.chung $ | ||||
|  * | ||||
|     Copyright 2006-2011 Chung, Hyung-Hwan. | ||||
|     This file is part of QSE. | ||||
| @ -193,9 +193,9 @@ QSE_DEFINE_COMMON_FUNCTIONS (pio) | ||||
|  * @return #qse_pio_t object on success, #QSE_NULL on failure | ||||
|  */ | ||||
| qse_pio_t* qse_pio_open ( | ||||
| 	qse_mmgr_t*       mmgr,  /**< memory manager */ | ||||
| 	qse_size_t        ext,   /**< extension size */ | ||||
| 	const qse_char_t* cmd,   /**< command to execute */ | ||||
| 	qse_mmgr_t*       mmgr,   /**< memory manager */ | ||||
| 	qse_size_t        ext,    /**< extension size */ | ||||
| 	const qse_char_t* cmd,    /**< command to execute */ | ||||
| 	int               oflags  /**< 0 or a number OR'ed of the | ||||
| 	                              #qse_pio_oflag_t enumerators*/ | ||||
| ); | ||||
| @ -292,7 +292,6 @@ qse_ssize_t qse_pio_read ( | ||||
| 	qse_size_t    size, /**< buffer size */ | ||||
| 	qse_pio_hid_t hid   /**< handle ID */ | ||||
| ); | ||||
| /******/ | ||||
|  | ||||
| /** | ||||
|  * The qse_pio_write() function writes data. | ||||
| @ -306,7 +305,6 @@ qse_ssize_t qse_pio_write ( | ||||
| 	qse_size_t    size,  /**< data size */ | ||||
| 	qse_pio_hid_t hid    /**< handle ID */ | ||||
| ); | ||||
| /******/ | ||||
|  | ||||
| /** | ||||
|  * The qse_pio_flush() flushes buffered data if #QSE_PIO_TEXT has been  | ||||
|  | ||||
| @ -1,5 +1,5 @@ | ||||
| /* | ||||
|  * $Id: str.h 504 2011-07-11 16:31:33Z hyunghwan.chung $ | ||||
|  * $Id: str.h 533 2011-08-04 15:43:28Z hyunghwan.chung $ | ||||
|  * | ||||
|     Copyright 2006-2011 Chung, Hyung-Hwan. | ||||
|     This file is part of QSE. | ||||
| @ -154,8 +154,7 @@ typedef qse_wchar_t* (*qse_wcsxsubst_subst_t) ( | ||||
| 	 (c>=QSE_T('a') && c<=QSE_T('z'))? ((c-QSE_T('a')+10<base)? (c-QSE_T('a')+10): base): base) | ||||
|  | ||||
| /* qse_strtonum (const qse_char_t* nptr, qse_char_t** endptr, int base) */ | ||||
| #define QSE_STRTONUM(value,nptr,endptr,base) \ | ||||
| { \ | ||||
| #define QSE_STRTONUM(value,nptr,endptr,base) do {\ | ||||
| 	int __ston_f = 0, __ston_v; \ | ||||
| 	const qse_char_t* __ston_ptr = nptr; \ | ||||
| 	for (;;) { \ | ||||
| @ -169,13 +168,12 @@ typedef qse_wchar_t* (*qse_wcsxsubst_subst_t) ( | ||||
| 	for (value = 0; (__ston_v = QSE_CHARTONUM(*__ston_ptr, base)) < base; __ston_ptr++) { \ | ||||
| 		value = value * base + __ston_v; \ | ||||
| 	} \ | ||||
| 	if (endptr != QSE_NULL) *((const qse_char_t**)endptr) = __ston_ptr; \ | ||||
| 	if (endptr) *((const qse_char_t**)endptr) = __ston_ptr; \ | ||||
| 	if (__ston_f > 0) value *= -1; \ | ||||
| } | ||||
| } while(0) | ||||
|  | ||||
| /* qse_strxtonum (const qse_char_t* nptr, qse_size_t len, qse_char_char** endptr, int base) */ | ||||
| #define QSE_STRXTONUM(value,nptr,len,endptr,base) \ | ||||
| { \ | ||||
| #define QSE_STRXTONUM(value,nptr,len,endptr,base) do {\ | ||||
| 	int __ston_f = 0, __ston_v; \ | ||||
| 	const qse_char_t* __ston_ptr = nptr; \ | ||||
| 	const qse_char_t* __ston_end = __ston_ptr + len; \ | ||||
| @ -193,9 +191,105 @@ typedef qse_wchar_t* (*qse_wcsxsubst_subst_t) ( | ||||
| 	               (__ston_v = QSE_CHARTONUM(*__ston_ptr, base)) != base; __ston_ptr++) { \ | ||||
| 		value = value * base + __ston_v; \ | ||||
| 	} \ | ||||
| 	if (endptr != QSE_NULL) *((const qse_char_t**)endptr) = __ston_ptr; \ | ||||
| 	if (endptr) *((const qse_char_t**)endptr) = __ston_ptr; \ | ||||
| 	if (__ston_f > 0) value *= -1; \ | ||||
| } | ||||
| } while(0) | ||||
|  | ||||
| /* int qse_mchartonum (qse_mchar_t c, int base) */ | ||||
| #define QSE_MCHARTONUM(c,base) \ | ||||
| 	((c>=QSE_MT('0') && c<=QSE_MT('9'))? ((c-QSE_MT('0')<base)? (c-QSE_MT('0')): base): \ | ||||
| 	 (c>=QSE_MT('A') && c<=QSE_MT('Z'))? ((c-QSE_MT('A')+10<base)? (c-QSE_MT('A')+10): base): \ | ||||
| 	 (c>=QSE_MT('a') && c<=QSE_MT('z'))? ((c-QSE_MT('a')+10<base)? (c-QSE_MT('a')+10): base): base) | ||||
|  | ||||
| /* qse_strtonum (const qse_mchar_t* nptr, qse_mchar_t** endptr, int base) */ | ||||
| #define QSE_MSTRTONUM(value,nptr,endptr,base) do {\ | ||||
| 	int __ston_f = 0, __ston_v; \ | ||||
| 	const qse_mchar_t* __ston_ptr = nptr; \ | ||||
| 	for (;;) { \ | ||||
| 		qse_mchar_t __ston_c = *__ston_ptr; \ | ||||
| 		if (__ston_c == QSE_MT(' ') || \ | ||||
| 		    __ston_c == QSE_MT('\t')) { __ston_ptr++; continue; } \ | ||||
| 		if (__ston_c == QSE_MT('-')) { __ston_f++; __ston_ptr++; } \ | ||||
| 		if (__ston_c == QSE_MT('+')) { __ston_ptr++; } \ | ||||
| 		break; \ | ||||
| 	} \ | ||||
| 	for (value = 0; (__ston_v = QSE_MCHARTONUM(*__ston_ptr, base)) < base; __ston_ptr++) { \ | ||||
| 		value = value * base + __ston_v; \ | ||||
| 	} \ | ||||
| 	if (endptr) *((const qse_mchar_t**)endptr) = __ston_ptr; \ | ||||
| 	if (__ston_f > 0) value *= -1; \ | ||||
| } while(0) | ||||
|  | ||||
| /* qse_strxtonum (const qse_mchar_t* nptr, qse_size_t len, qse_mchar_t** endptr, int base) */ | ||||
| #define QSE_MSTRXTONUM(value,nptr,len,endptr,base) do {\ | ||||
| 	int __ston_f = 0, __ston_v; \ | ||||
| 	const qse_mchar_t* __ston_ptr = nptr; \ | ||||
| 	const qse_mchar_t* __ston_end = __ston_ptr + len; \ | ||||
| 	value = 0; \ | ||||
| 	while (__ston_ptr < __ston_end) { \ | ||||
| 		qse_mchar_t __ston_c = *__ston_ptr; \ | ||||
| 		if (__ston_c == QSE_MT(' ') || __ston_c == QSE_MT('\t')) { \ | ||||
| 			__ston_ptr++; continue; \ | ||||
| 		} \ | ||||
| 		if (__ston_c == QSE_MT('-')) { __ston_f++; __ston_ptr++; } \ | ||||
| 		if (__ston_c == QSE_MT('+')) { __ston_ptr++; } \ | ||||
| 		break; \ | ||||
| 	} \ | ||||
| 	for (value = 0; __ston_ptr < __ston_end && \ | ||||
| 	               (__ston_v = QSE_MCHARTONUM(*__ston_ptr, base)) != base; __ston_ptr++) { \ | ||||
| 		value = value * base + __ston_v; \ | ||||
| 	} \ | ||||
| 	if (endptr) *((const qse_mchar_t**)endptr) = __ston_ptr; \ | ||||
| 	if (__ston_f > 0) value *= -1; \ | ||||
| } while(0) | ||||
|  | ||||
| /* int qse_wchartonum (qse_wchar_t c, int base) */ | ||||
| #define QSE_WCHARTONUM(c,base) \ | ||||
| 	((c>=QSE_WT('0') && c<=QSE_WT('9'))? ((c-QSE_WT('0')<base)? (c-QSE_WT('0')): base): \ | ||||
| 	 (c>=QSE_WT('A') && c<=QSE_WT('Z'))? ((c-QSE_WT('A')+10<base)? (c-QSE_WT('A')+10): base): \ | ||||
| 	 (c>=QSE_WT('a') && c<=QSE_WT('z'))? ((c-QSE_WT('a')+10<base)? (c-QSE_WT('a')+10): base): base) | ||||
|  | ||||
| /* qse_strtonum (const qse_wchar_t* nptr, qse_wchar_t** endptr, int base) */ | ||||
| #define QSE_WSTRTONUM(value,nptr,endptr,base) do {\ | ||||
| 	int __ston_f = 0, __ston_v; \ | ||||
| 	const qse_wchar_t* __ston_ptr = nptr; \ | ||||
| 	for (;;) { \ | ||||
| 		qse_wchar_t __ston_c = *__ston_ptr; \ | ||||
| 		if (__ston_c == QSE_WT(' ') || \ | ||||
| 		    __ston_c == QSE_WT('\t')) { __ston_ptr++; continue; } \ | ||||
| 		if (__ston_c == QSE_WT('-')) { __ston_f++; __ston_ptr++; } \ | ||||
| 		if (__ston_c == QSE_WT('+')) { __ston_ptr++; } \ | ||||
| 		break; \ | ||||
| 	} \ | ||||
| 	for (value = 0; (__ston_v = QSE_WCHARTONUM(*__ston_ptr, base)) < base; __ston_ptr++) { \ | ||||
| 		value = value * base + __ston_v; \ | ||||
| 	} \ | ||||
| 	if (endptr) *((const qse_wchar_t**)endptr) = __ston_ptr; \ | ||||
| 	if (__ston_f > 0) value *= -1; \ | ||||
| } while(0) | ||||
|  | ||||
| /* qse_strxtonum (const qse_wchar_t* nptr, qse_size_t len, qse_wchar_t** endptr, int base) */ | ||||
| #define QSE_WSTRXTONUM(value,nptr,len,endptr,base) do {\ | ||||
| 	int __ston_f = 0, __ston_v; \ | ||||
| 	const qse_wchar_t* __ston_ptr = nptr; \ | ||||
| 	const qse_wchar_t* __ston_end = __ston_ptr + len; \ | ||||
| 	value = 0; \ | ||||
| 	while (__ston_ptr < __ston_end) { \ | ||||
| 		qse_wchar_t __ston_c = *__ston_ptr; \ | ||||
| 		if (__ston_c == QSE_WT(' ') || __ston_c == QSE_WT('\t')) { \ | ||||
| 			__ston_ptr++; continue; \ | ||||
| 		} \ | ||||
| 		if (__ston_c == QSE_WT('-')) { __ston_f++; __ston_ptr++; } \ | ||||
| 		if (__ston_c == QSE_WT('+')) { __ston_ptr++; } \ | ||||
| 		break; \ | ||||
| 	} \ | ||||
| 	for (value = 0; __ston_ptr < __ston_end && \ | ||||
| 	               (__ston_v = QSE_WCHARTONUM(*__ston_ptr, base)) != base; __ston_ptr++) { \ | ||||
| 		value = value * base + __ston_v; \ | ||||
| 	} \ | ||||
| 	if (endptr) *((const qse_wchar_t**)endptr) = __ston_ptr; \ | ||||
| 	if (__ston_f > 0) value *= -1; \ | ||||
| } while(0) | ||||
|  | ||||
| /** | ||||
|  * The qse_mbstrmx_op_t defines a string trimming operation.  | ||||
|  | ||||
| @ -213,7 +213,8 @@ qse_httpd_task_t* qse_httpd_entaskcgi ( | ||||
| 	qse_httpd_t*              httpd, | ||||
| 	qse_httpd_client_t*       client, | ||||
| 	const qse_httpd_task_t*   pred, | ||||
| 	const qse_char_t*         path | ||||
| 	const qse_char_t*         path, | ||||
| 	const qse_http_version_t* version | ||||
| ); | ||||
|  | ||||
| void* qse_httpd_allocmem ( | ||||
|  | ||||
		Reference in New Issue
	
	Block a user