--- parser3/src/include/pa_common.h 2003/02/14 17:38:28 1.89.2.13 +++ parser3/src/include/pa_common.h 2003/11/20 16:34:24 1.97 @@ -8,14 +8,13 @@ #ifndef PA_COMMON_H #define PA_COMMON_H -static const char* IDENT_COMMON_H="$Date: 2003/02/14 17:38:28 $"; +static const char * const IDENT_COMMON_H="$Date: 2003/11/20 16:34:24 $"; -#include "pa_pool.h" #include "pa_string.h" #include "pa_hash.h" -#include "pa_value.h" -typedef Hash HashStringValue; +class Value; +typedef Hash HashStringValue; // replace system s*nprintf with our versions #undef vsnprintf @@ -57,45 +56,24 @@ inline long lseek( int handle, long offs #endif -#ifdef HAVE_TRUNC -# ifndef trunc -extern "C" double trunc(double); -# endif -#else -inline double trunc(double param) { return param > 0? floor(param) : ceil(param); } -#endif - -#ifdef HAVE_ROUND -# ifndef round -extern "C" double round(double); -# endif -#else -inline double round(double param) { return floor(param+0.5); } -#endif -#ifdef HAVE_SIGN -# ifndef sign -extern "C" double sign(double); -# endif -#else -inline double sign(double param) { return param > 0 ? 1 : ( param < 0 ? -1 : 0 ); } -#endif - -/// yields to OS for secs secs and usecs milliseconds -int pa_sleep(unsigned long secs, unsigned long usecs); - /** under WIN32 "t" mode fixes DOS chars OK, can't say that about other systems/ line break styles */ void fix_line_breaks( - char *buf, - size_t& size ///< may change! used to speedup next actions - ); - -typedef void (*File_read_action)(Pool& pool, - struct stat& finfo, - int f, - StringPtr file_spec, const char* fname, bool as_text, - void *context); + char *str, + size_t& length///< may change! used to speedup next actions + ); + +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); + +typedef void (*File_read_action)( + struct stat& finfo, + int f, + const String& file_spec, const char* fname, bool as_text, + void *context); /** shared-lock specified file, @@ -104,39 +82,39 @@ typedef void (*File_read_action)(Pool& p @returns true if read OK */ -bool file_read_action_under_lock(Pool& pool, StringPtr file_spec, +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 using pool, + read specified text file using 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! @returns true if read OK */ -char *file_read_text(Pool& pool, Charset& charset, - StringPtr file_spec, +char *file_read_text(Request_charsets& charsets, + const String& file_spec, bool fail_on_read_problem=true, - HashStringValue* options=0/*, HashStringValuePtr* out_fields=0*/); + HashStringValue* options=0/*, HashStringValue* * out_fields=0*/); struct File_read_result { bool success; - char* data; size_t size; - HashStringValuePtr headers; + char* str; size_t length; + HashStringValue* headers; }; /** - read specified file using pool, + read specified file using 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! @returns true if read OK */ -File_read_result file_read(Pool& pool, Charset& charset, - StringPtr file_spec, +File_read_result file_read(Request_charsets& charsets, + const String& file_spec, bool as_text, HashStringValue* options=0, bool fail_on_read_problem=true); @@ -152,7 +130,7 @@ typedef void (*File_write_action)(int f, @returns true if locked OK, or false if non-blocking locking failed */ bool file_write_action_under_lock( - StringPtr file_spec, + const String& file_spec, const char* action_name, File_write_action action, void *context, bool as_text=false, bool do_append=false, @@ -164,7 +142,7 @@ bool file_write_action_under_lock( throws an exception in case of problems */ void file_write( - StringPtr file_spec, + const String& file_spec, const char* data, size_t size, bool as_text, bool do_append=false); @@ -173,21 +151,21 @@ void file_write( delete specified file throws an exception in case of problems */ -bool file_delete(StringPtr file_spec, bool fail_on_read_problem=true); +bool file_delete(const String& file_spec, bool fail_on_problem=true); /** move specified file throws an exception in case of problems */ -void file_move(StringPtr old_spec, StringPtr new_spec); +void file_move(const String& old_spec, const String& new_spec); bool entry_exists(const char* fname, struct stat *afinfo=0); -bool entry_exists(StringPtr file_spec); -bool file_readable(StringPtr file_spec); -bool dir_readable(StringPtr file_spec); -StringPtr file_readable(String& path, String& name); -bool file_executable(StringPtr file_spec); +bool entry_exists(const String& file_spec); +bool file_readable(const String& file_spec); +bool dir_readable(const String& file_spec); +const String* file_readable(const String& path, const String& name); +bool file_executable(const String& file_spec); -bool file_stat(StringPtr file_spec, +bool file_stat(const String& file_spec, size_t& rsize, time_t& ratime, time_t& rmtime, @@ -204,18 +182,11 @@ char *getrow(char **row_ref,char delim=' char *lsplit(char *string, char delim); char *lsplit(char **string_ref,char delim); char *rsplit(char *string, char delim); -const char* format(Pool& pool, double value, char *fmt); - -#ifndef max -inline int max(int a, int b) { return a>b?a:b; } -inline int min(int a, int b){ return ab?a:b; } -inline size_t min(size_t a, size_t b){ return a