--- parser3/src/include/pa_common.h 2003/01/27 15:07:47 1.89.2.4 +++ parser3/src/include/pa_common.h 2003/02/06 14:24:50 1.89.2.9 @@ -1,37 +1,37 @@ /** @file Parser: commonly used functions. - Copyright (c) 2001, 2003 ArtLebedev Group (http://www.artlebedev.com) + Copyright (c) 2001-2003 ArtLebedev Group (http://www.artlebedev.com) Author: Alexandr Petrosian (http://paf.design.ru) */ #ifndef PA_COMMON_H #define PA_COMMON_H -static const char* IDENT_COMMON_H="$Date: 2003/01/27 15:07:47 $"; +static const char* IDENT_COMMON_H="$Date: 2003/02/06 14:24:50 $"; #include "pa_pool.h" #include "pa_string.h" #include "pa_hash.h" #include "pa_value.h" -typedef Hash HashStringValue; +typedef Hash HashStringValue; // replace system s*nprintf with our versions #undef vsnprintf -int __vsnprintf(char *, size_t, const char *, va_list); +int __vsnprintf(char *, size_t, const char* , va_list); #define vsnprintf __vsnprintf #undef snprintf -int __snprintf(char *, size_t, const char *, ...); +int __snprintf(char *, size_t, const char* , ...); #define snprintf __snprintf #if _MSC_VER /* -inline int open( const char *filename, int oflag ) { return _open(filename, oflag); } +inline int open( const char* filename, int oflag ) { return _open(filename, oflag); } inline int close( int handle ) { return _close(handle); } inline int read( int handle, void *buffer, unsigned int count ) { return _read(handle,buffer,count); } inline int write( int handle, const void *buffer, unsigned int count ) { return _write(handle,buffer,count); } -inline int stat( const char *path, struct _stat *buffer ) { return _stat(path, buffer); } +inline int stat( const char* path, struct _stat *buffer ) { return _stat(path, buffer); } inline long lseek( int handle, long offset, int origin ) { return _lseek(handle, offset, origin); } */ @@ -94,7 +94,7 @@ void fix_line_breaks( typedef void (*File_read_action)(Pool& pool, struct stat& finfo, int f, - ConstStringPtr file_spec, const char *fname, bool as_text, + StringPtr file_spec, const char* fname, bool as_text, void *context); /** @@ -104,37 +104,42 @@ typedef void (*File_read_action)(Pool& p @returns true if read OK */ -bool file_read_action_under_lock(Pool& pool, ConstStringPtr file_spec, - const char *action_name, File_read_action action, void *context, +bool file_read_action_under_lock(Pool& pool, StringPtr 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, 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, - ConstStringPtr file_spec, + StringPtr file_spec, bool fail_on_read_problem=true, - HashStringValue* options=0, HashStringValue** out_fields=0); + HashStringValue* options=0/*, HashStringValuePtr* out_fields=0*/); struct File_read_result { bool success; - HashStringValuePtr fields; + char* data; size_t data_size; + HashStringValuePtr headers; }; /** read specified file using pool, 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, - ConstStringPtr file_spec, + StringPtr file_spec, char *& ptr, size_t& size, bool as_text, - HashStringValue* options=0, HashStringValue** out_fields=0, + HashStringValue* options=0, bool fail_on_read_problem=true); typedef void (*File_write_action)(int f, void *context); @@ -148,8 +153,8 @@ 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( - ConstStringPtr file_spec, - const char *action_name, File_write_action action, void *context, + StringPtr file_spec, + const char* action_name, File_write_action action, void *context, bool as_text=false, bool do_append=false, bool do_block=true, @@ -160,7 +165,7 @@ bool file_write_action_under_lock( throws an exception in case of problems */ void file_write( - ConstStringPtr file_spec, + StringPtr file_spec, const void *data, size_t size, bool as_text, bool do_append=false); @@ -169,21 +174,21 @@ void file_write( delete specified file throws an exception in case of problems */ -bool file_delete(ConstStringPtr file_spec, bool fail_on_read_problem=true); +bool file_delete(StringPtr file_spec, bool fail_on_read_problem=true); /** move specified file throws an exception in case of problems */ -void file_move(ConstStringPtr old_spec, ConstStringPtr new_spec); +void file_move(StringPtr old_spec, StringPtr new_spec); -bool entry_exists(const char *fname, struct stat *afinfo=0); -bool entry_exists(ConstStringPtr file_spec); -bool file_readable(ConstStringPtr file_spec); -bool dir_readable(ConstStringPtr file_spec); -ConstStringPtr file_readable(ConstStringPtr path, ConstStringPtr name); -bool file_executable(ConstStringPtr file_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(StringPtr path, StringPtr name); +bool file_executable(StringPtr file_spec); -bool file_stat(ConstStringPtr file_spec, +bool file_stat(StringPtr file_spec, size_t& rsize, time_t& ratime, time_t& rmtime, @@ -200,7 +205,7 @@ 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); +const char* format(Pool& pool, double value, char *fmt); #ifndef max inline int max(int a, int b) { return a>b?a:b; } @@ -211,7 +216,7 @@ inline size_t min(size_t a, size_t b){ r size_t stdout_write(const void *buf, size_t size); -char *unescape_chars(const char *cp, int len); +char *unescape_chars(Pool& pool, const char* cp, int len); #ifdef WIN32 void back_slashes_to_slashes(char *s); @@ -223,11 +228,15 @@ void back_slashes_to_slashes(char *s); qsort(names,cnt,sizeof_names,func_addr) #endif -bool StrEqNc(const char *s1, const char *s2, bool strict=true); +bool StrEqNc(const char* s1, const char* s2, bool strict=true); #define SECS_PER_DAY (60*60*24) int getMonthDays(int year, int month); void remove_crlf(char *start, char *end); +// globals + +extern StringPtr file_status_name; + #endif