--- parser3/src/include/pa_common.h 2016/07/29 13:30:41 1.166 +++ parser3/src/include/pa_common.h 2020/10/14 21:22:58 1.181 @@ -1,14 +1,14 @@ /** @file Parser: commonly used functions. - Copyright (c) 2001-2015 Art. Lebedev Studio (http://www.artlebedev.com) + Copyright (c) 2001-2017 Art. Lebedev Studio (http://www.artlebedev.com) Author: Alexandr Petrosian (http://paf.design.ru) */ #ifndef PA_COMMON_H #define PA_COMMON_H -#define IDENT_PA_COMMON_H "$Id: pa_common.h,v 1.166 2016/07/29 13:30:41 moko Exp $" +#define IDENT_PA_COMMON_H "$Id: pa_common.h,v 1.181 2020/10/14 21:22:58 moko Exp $" #include "pa_string.h" #include "pa_hash.h" @@ -39,8 +39,6 @@ class Request; #define HTTP_CONTENT_TYPE_MULTIPART_RELATED "multipart/related" #define HTTP_CONTENT_TYPE_MULTIPART_MIXED "multipart/mixed" -#define BASE64_STRICT_OPTION_NAME "strict" - const String content_disposition_filename_name(CONTENT_DISPOSITION_FILENAME_NAME); #define HASH_ORDER @@ -55,11 +53,11 @@ typedef HASH_STRING HashStringVa // replace system s*nprintf with our versions #undef vsnprintf -int __vsnprintf(char *, size_t, const char* , va_list); -#define vsnprintf __vsnprintf +int pa_vsnprintf(char *, size_t, const char* , va_list); +#define vsnprintf pa_vsnprintf #undef snprintf -int __snprintf(char *, size_t, const char* , ...); -#define snprintf __snprintf +int pa_snprintf(char *, size_t, const char* , ...); +#define snprintf pa_snprintf #ifdef _MSC_VER @@ -77,6 +75,21 @@ int __snprintf(char *, size_t, const cha # define strncasecmp _strnicmp #endif +#define stat __stat64 +#define pa_fstat _fstat64 + +int pa_stat(const char *pathname, struct stat *buffer); +int pa_open(const char *pathname, int flags, int mode=0); +FILE *pa_fopen(const char *pathname, const char *mode); + +#else + +#define pa_stat stat +#define pa_fstat fstat + +#define pa_open open +#define pa_fopen fopen + #endif /** @@ -109,22 +122,13 @@ bool file_read_action_under_lock(const S bool fail_on_read_problem=true); /** - read specified text file using + read specified text file if fail_on_read_problem is true[default] throws an exception WARNING: charset is used for http header case conversion, it's not a charset of input file! */ -char *file_read_text(Request_charsets& charsets, - const String& file_spec, - bool fail_on_read_problem=true, - HashStringValue* options=0, - bool transcode_result=true); - -char *file_load_text(Request& r, - const String& file_spec, - bool fail_on_read_problem=true, - HashStringValue* options=0, - bool transcode_result=true); +char *file_read_text(Request_charsets& charsets, const String& file_spec, bool fail_on_read_problem = true); +char *file_load_text(Request& r, const String& file_spec, bool fail_on_read_problem = true, HashStringValue* options = 0, bool transcode_result = true); struct File_read_result { bool success; @@ -133,24 +137,18 @@ struct File_read_result { }; /** - read specified file using + read specified binary file if fail_on_read_problem is true[default] throws an exception +*/ - WARNING: charset is used for http header case conversion, it's not a charset of input file! +File_read_result file_read_binary(const String& file_spec, bool fail_on_read_problem = true, char* buf = 0, size_t offset = 0, size_t limit = 0); + +/** + load specified file + if fail_on_read_problem is true[default] throws an exception */ -File_read_result file_read(Request_charsets& charsets, - const String& file_spec, - bool as_text, - HashStringValue* options=0, - bool fail_on_read_problem=true, - char* buf=0, size_t offset=0, size_t size=0, bool transcode_text_result=true); -File_read_result file_load(Request& r, - const String& file_spec, - bool as_text, - HashStringValue* options=0, - bool fail_on_read_problem=true, - char* buf=0, size_t offset=0, size_t size=0, bool transcode_text_result=true); +File_read_result file_load(Request& r, const String& file_spec, bool as_text, HashStringValue* options=0, bool fail_on_read_problem=true, bool transcode_text_result=true); typedef void (*File_write_action)(int f, void *context); @@ -203,7 +201,8 @@ bool dir_exists(const String& file_spec) const String* file_exist(const String& path, const String& name); bool file_executable(const String& file_spec); -bool file_stat(const String& file_spec, size_t& rsize, time_t& ratime, time_t& rmtime, time_t& rctime, bool fail_on_read_problem=true); +bool file_stat(const String& file_spec, uint64_t& rsize, time_t& ratime, time_t& rmtime, time_t& rctime, bool fail_on_read_problem=true); +size_t check_file_size(uint64_t size, const String* file_spec); size_t stdout_write(const void *buf, size_t size); @@ -253,15 +252,11 @@ char *str_upper(const char *s, size_t he const char* hex_string(unsigned char* bytes, size_t size, bool upcase); extern const char* hex_digits; -void pa_base64_decode(const char *in, size_t in_size, char*& result, size_t& result_size, bool strict=false); -char* pa_base64_encode(const char *in, size_t in_size); -char* pa_base64_encode(const String& file_spec); - const char *pa_idna_encode(const char *in, Charset &source); const char *pa_idna_decode(const char *in, Charset &source); -const unsigned long pa_crc32(const char *in, size_t in_size); -const unsigned long pa_crc32(const String& file_spec); +unsigned long pa_crc32(const char *in, size_t in_size); +unsigned long pa_crc32(const String& file_spec); /** Mix functions @@ -269,15 +264,6 @@ const unsigned long pa_crc32(const Strin #define PA_DEFAULT(A,B) ((A) ? (A):(B) ) -// some stuff for use with .for_each -static void copy_all_overwrite_to(HashStringValue::key_type key, HashStringValue::value_type value, HashStringValue* dest) { - dest->put(key, value); -} - -static void remove_key_from(HashStringValue::key_type key, HashStringValue::value_type /*value*/, HashStringValue* dest) { - dest->remove(key); -} - Charset* detect_charset(const char* content_type); // globals @@ -286,8 +272,6 @@ extern const String file_status_name; // global defines for file options which are handled but not checked elsewhere, we check them -#define PA_SQL_LIMIT_NAME "limit" -#define PA_SQL_OFFSET_NAME "offset" #define PA_COLUMN_SEPARATOR_NAME "separator" #define PA_COLUMN_ENCLOSER_NAME "encloser" #define PA_CHARSET_NAME "charset" @@ -296,10 +280,19 @@ extern const String file_status_name; // globals defines for sql options #define SQL_BIND_NAME "bind" +#define PA_SQL_LIMIT_NAME "limit" +#define PA_SQL_OFFSET_NAME "offset" #define SQL_DEFAULT_NAME "default" #define SQL_DISTINCT_NAME "distinct" #define SQL_VALUE_TYPE_NAME "type" +extern String sql_bind_name; +extern String sql_limit_name; +extern String sql_offset_name; +extern String sql_default_name; +extern String sql_distinct_name; +extern String sql_value_type_name; + #ifndef DOXYGEN enum Table2hash_distint { D_ILLEGAL, D_FIRST }; enum Table2hash_value_type { C_HASH, C_STRING, C_TABLE, C_CODE };