--- parser3/src/include/pa_common.h 2020/12/02 17:22:44 1.184 +++ parser3/src/include/pa_common.h 2026/01/06 16:36:39 1.197 @@ -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-2024 Art. Lebedev Studio (http://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.184 2020/12/02 17:22:44 moko Exp $" +#define IDENT_PA_COMMON_H "$Id: pa_common.h,v 1.197 2026/01/06 16:36:39 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 @@ -82,7 +81,7 @@ int pa_stat(const char *pathname, struct int pa_open(const char *pathname, int flags, int mode=0); FILE *pa_fopen(const char *pathname, const char *mode); -#define pa_lseek(fd, offset) _lseeki64(fd, offset, SEEK_SET) +#define pa_lseek _lseeki64 #else @@ -92,7 +91,7 @@ FILE *pa_fopen(const char *pathname, con #define pa_open open #define pa_fopen fopen -#define pa_lseek(fd, offset) lseek(fd, offset, SEEK_SET) +#define pa_lseek lseek #endif @@ -100,7 +99,7 @@ FILE *pa_fopen(const char *pathname, con file related functions */ -#define FILE_BUFFER_SIZE 4096 +#define FILE_BUFFER_SIZE (128*0x400) int pa_lock_shared_blocking(int fd); int pa_lock_exclusive_blocking(int fd); @@ -212,7 +211,7 @@ size_t stdout_write(const void *buf, siz 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); +ssize_t file_block_read(const int f, void* buffer, const size_t size); /** String related functions @@ -228,8 +227,6 @@ char *lsplit(char *string, char delim); char *lsplit(char **string_ref,char delim); char *rsplit(char *string, char delim); -const char* format(double value, const char *fmt); - char* unescape_chars(const char* cp, int len, Charset* client_charset=0, bool js=false/*true==decode \uXXXX and don't convert '+' to space*/); char *search_stop(char*& current, char cstop_at); @@ -244,17 +241,20 @@ void back_slashes_to_slashes(char *s); 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 n); 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;