--- parser3/src/include/pa_common.h 2020/12/03 22:48:09 1.185 +++ parser3/src/include/pa_common.h 2026/10/01 11:48:37 1.202 @@ -1,14 +1,14 @@ /** @file Parser: commonly used functions. - Copyright (c) 2001-2017 Art. Lebedev Studio (http://www.artlebedev.com) - Author: Alexandr Petrosian (http://paf.design.ru) + Copyright (c) 2001-2026 Art. Lebedev Studio (https://www.artlebedev.com) + Authors: Konstantin Morshnev , Alexandr Petrosian */ #ifndef PA_COMMON_H #define PA_COMMON_H -#define IDENT_PA_COMMON_H "$Id: pa_common.h,v 1.185 2020/12/03 22:48:09 moko Exp $" +#define IDENT_PA_COMMON_H "$Id: pa_common.h,v 1.202 2026/10/01 11:48:37 moko Exp $" #include "pa_string.h" #include "pa_hash.h" @@ -20,7 +20,6 @@ class Request; #define HTTP_STATUS_CAPITALIZED "Status" #define HTTP_CONTENT_LENGTH "content-length" -#define HTTP_CONTENT_LENGTH_CAPITALIZED "Content-Length" #define HTTP_CONTENT_TYPE "content-type" #define HTTP_CONTENT_TYPE_UPPER "CONTENT-TYPE" @@ -39,7 +38,7 @@ class Request; #define HTTP_CONTENT_TYPE_MULTIPART_RELATED "multipart/related" #define HTTP_CONTENT_TYPE_MULTIPART_MIXED "multipart/mixed" -const String content_disposition_filename_name(CONTENT_DISPOSITION_FILENAME_NAME); +extern const String content_disposition_filename_name; #define HASH_ORDER @@ -52,7 +51,7 @@ class Value; typedef HASH_STRING HashStringValue; // replace system s*nprintf with our versions -#undef vsnprintf +#undef vsnprintf int pa_vsnprintf(char *, size_t, const char* , va_list); #define vsnprintf pa_vsnprintf #undef snprintf @@ -61,12 +60,6 @@ int pa_snprintf(char *, size_t, const ch #ifdef _MSC_VER -//access -#define F_OK 0 -#define X_OK 1 -#define W_OK 2 -#define R_OK 4 - #ifndef strcasecmp # define strcasecmp _stricmp #endif @@ -75,160 +68,31 @@ int pa_snprintf(char *, size_t, const ch # 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); - -#define pa_lseek _lseeki64 - -#else - -#define pa_stat stat -#define pa_fstat fstat - -#define pa_open open -#define pa_fopen fopen - -#define pa_lseek lseek - #endif -/** - file related functions -*/ - -#define FILE_BUFFER_SIZE 4096 - -int pa_lock_shared_blocking(int fd); -int pa_lock_exclusive_blocking(int fd); -int pa_lock_exclusive_nonblocking(int fd); -int pa_unlock(int fd); - -void create_dir_for_file(const String& file_spec); - -int pa_get_valid_file_options_count(HashStringValue& options); - -typedef void (*File_read_action)(struct stat& finfo, int f, const String& file_spec, void *context); - -/** - shared-lock specified file, - do actions under lock. - if fail_on_read_problem is true[default] throws an exception - - @returns true if read OK -*/ -bool file_read_action_under_lock(const String& file_spec, - const char* action_name, File_read_action action, void *context, - bool as_text=false, - bool fail_on_read_problem=true); - -/** - 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); -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; - char* str; size_t length; - HashStringValue* headers; -}; - -/** - read specified binary file - if fail_on_read_problem is true[default] throws an exception -*/ - -File_read_result file_read_binary(const String& file_spec, bool fail_on_read_problem = true, char* buf = 0, uint64_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_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); - -/** - lock specified file exclusively, - do actions under lock. - throws an exception in case of problems - - if block=false does non-blocking lock - @returns true if locked OK, or false if non-blocking locking failed -*/ -bool file_write_action_under_lock( - const String& file_spec, - const char* action_name, - File_write_action action, - void *context, - bool as_text=false, - bool do_append=false, - bool do_block=true, - bool fail_on_lock_problem=true); - /** - write data to specified file, - throws an exception in case of problems -*/ -void file_write( - Request_charsets& charsets, - const String& file_spec, - const char* data, - size_t size, - bool as_text, - bool do_append=false, - Charset* asked_charset=0); - -/** - delete specified file - throws an exception in case of problems -*/ -bool file_delete(const String& file_spec, bool fail_on_problem=true, bool keep_empty_dirs=false); -/** - move specified file - throws an exception in case of problems -*/ -void file_move(const String& old_spec, const String& new_spec, bool keep_empty_dirs=false); - -bool entry_exists(const char* fname, struct stat *afinfo=0); -bool entry_exists(const String& file_spec); -bool file_exist(const String& file_spec); -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, 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); - -void check_safe_mode(struct stat finfo, const String& file_spec, const char* fname); - -int file_block_read(const int f, unsigned char* buffer, const size_t size); - -/** String related functions */ -/** under WIN32 "t" mode fixes DOS chars OK, - can't say that about other systems/ line break styles -*/ +// Under WIN32 "t" mode fixes DOS chars OK, can't say that about other systems/ line break styles void fix_line_breaks(char *str, size_t& length /* < may change! used to speedup next actions */); char *getrow(char **row_ref,char delim='\n'); + +// Return the last occurrence of any character in chars or NULL if absent +const char *strrpbrk(const char *string, const char *chars); +inline char *strrpbrk(char *string, const char *chars) { + return (char*)strrpbrk((const char*)string, chars); +} + +// Split at the first occurrence of delimiter; return the suffix or NULL if absent char *lsplit(char *string, char delim); -char *lsplit(char **string_ref,char delim); -char *rsplit(char *string, char delim); +// Return the prefix; advance *string_ref to the suffix or set it to NULL if delimiter is absent +char *lsplit(char **string_ref, char delim); -const char* format(double value, const char *fmt); +// Split at the last occurrence of delimiter(s); return the suffix or NULL if absent +char *rsplit(char *string, char delim); +char *rsplit(char *string, const char *delims); char* unescape_chars(const char* cp, int len, Charset* client_charset=0, bool js=false/*true==decode \uXXXX and don't convert '+' to space*/); @@ -238,23 +102,26 @@ inline int pa_strncasecmp(const char* st return strncasecmp(str, substr, count ? count : strlen(substr)); } -#ifdef WIN32 -void back_slashes_to_slashes(char *s); -#endif +// copy of the path with '/' only +char* backslashes_to_slashes(const char* path); +// same, keeping the original languages +const String& backslashes_to_slashes(const String& path); size_t strpos(const char *str, const char *substr); -int remove_crlf(char *start, char *end); +size_t remove_crlf(char *start, char *end); inline bool pa_isalpha(unsigned char c) { return (((c>='A') && (c<='Z')) || ((c>='a') && (c<='z'))); } inline bool pa_isalnum(unsigned char c) { return (((c>='0') && (c<='9')) || pa_isalpha(c)); } +void pa_strncpy(char *dst, const char *src, size_t dst_size); char *pa_strcat(const char *a, const char *b, const char *c = 0); -const char *pa_filename(const char *path); const char* capitalize(const char* s); -char *str_lower(const char *s, size_t helper_length=0); -char *str_upper(const char *s, size_t helper_length=0); +char *str_lower(const char *s, size_t length); +char *str_upper(const char *s, size_t length); +inline char *str_lower(const char *s) { return str_lower(s, strlen(s)); } +inline char *str_upper(const char *s) { return str_upper(s, strlen(s)); } const char* hex_string(unsigned char* bytes, size_t size, bool upcase); extern const char* hex_digits; @@ -265,7 +132,7 @@ const char *pa_idna_decode(const char *i unsigned long pa_crc32(const char *in, size_t in_size); unsigned long pa_crc32(const String& file_spec); -/** +/** Mix functions */ @@ -306,4 +173,3 @@ enum Table2hash_value_type { C_HASH, C_S #endif #endif -