--- parser3/src/include/pa_common.h 2001/03/20 06:45:18 1.18 +++ parser3/src/include/pa_common.h 2001/11/14 13:10:30 1.65 @@ -2,47 +2,44 @@ Parser: commonly used functions. Copyright (c) 2001 ArtLebedev Group (http://www.artlebedev.com) + Author: Alexander Petrosyan (http://paf.design.ru) - Author: Alexander Petrosyan (http://design.ru/paf) - - $Id: pa_common.h,v 1.18 2001/03/20 06:45:18 paf Exp $ + $Id: pa_common.h,v 1.65 2001/11/14 13:10:30 paf Exp $ */ #ifndef PA_COMMON_H #define PA_COMMON_H -#ifdef HAVE_CONFIG_H -# include "pa_config.h" -#endif - -#ifdef WIN32 -# include -#endif - -#include -#include +#include "pa_config_includes.h" #include "pa_pool.h" +#include "pa_string.h" -class String; class Value; -#ifdef WIN32 - -#define open _open -#define close _close -#define read _read -#define stat _stat - -#define vsnprintf __vsnprintf -#define snprintf __snprintf +#if _MSC_VER +// system one called "_snprintf" +#else +// remember system one +inline int _vsnprintf(char *b, size_t s, const char *f, va_list l) { return snprintf(b, s, f, l); } +#endif +// replace system s*nprintf with our versions +#undef vsnpritnf int __vsnprintf(char *, size_t, const char *, va_list); +#define vsnprintf __vsnprintf +#undef snprintf int __snprintf(char *, size_t, const char *, ...); +#define snprintf __snprintf -//flock -#define LOCK_EX _LK_NBLCK -#define LOCK_UN _LK_UNLCK -void flock(int fd, int operation); +#if _MSC_VER +/* +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 long lseek( int handle, long offset, int origin ) { return _lseek(handle, offset, origin); } +*/ //access #define F_OK 0 @@ -50,43 +47,105 @@ void flock(int fd, int operation); #define W_OK 2 #define R_OK 4 -#define strcasecmp _stricmp -#define strncasecmp _strnicmp -#define mkdir(path, mode) _mkdir(path) +#ifndef strcasecmp +# define strcasecmp _stricmp +#endif +#ifndef strncasecmp +# define strncasecmp _strnicmp +#endif +#ifndef mkdir +# define mkdir(path, mode) _mkdir(path) +#endif -#define putenv _putenv +#ifndef putenv +# define putenv _putenv +#endif + +#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 -/// @todo define it -#ifdef SUN -//flock -#define LOCK_EX F_LOCK -#define LOCK_UN F_ULOCK -void flock(int fd, int operation); +#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 + -/// @todo use somewhere -void lock(FILE *f, long position); -/// @todo use somewhere -void unlock(FILE *f); +/** 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 + ); + +/** + read specified text file using pool, + if fail_on_read_problem is true[default] throws an exception +*/ +char *file_read_text(Pool& pool, + const String& file_spec, + bool fail_on_read_problem=true); /** read specified file using pool, if fail_on_read_problem is true[default] throws an exception */ -char *file_read(Pool& pool, - const char *fname, - bool fail_on_read_problem=true); +bool file_read(Pool& pool, const String& file_spec, + void*& data, size_t& size, + bool as_text, + bool fail_on_read_problem=true, + size_t offset=0, size_t limit=0); /** write data to specified file using pool, throws an exception in case of problems */ void file_write(Pool& pool, - const char *fname, - const char *data, size_t size, - bool exclusive=false); + const String& file_spec, + const void *data, size_t size, + bool as_text, + bool do_append=false/*, + bool exclusive=false*/); + +/** + delete specified file + throws an exception in case of problems +*/ +void file_delete(Pool& pool, const String& file_spec); +/** + move specified file + throws an exception in case of problems +*/ +void file_move(Pool& pool, const String& old_spec, const String& new_spec); + +bool file_readable(const String& file_spec); +bool dir_readable(const String& file_spec); +String *file_readable(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); /** scans for @a delim[default \n] in @a *row_ref, @@ -95,7 +154,7 @@ void file_write(Pool& pool, or to zero if no @a delim were found. */ char *getrow(char **row_ref,char delim='\n'); -//char *lsplit(char *,char); +//char *lsplit(char *string, char delim); char *lsplit(char **string_ref,char delim); char *rsplit(char *string, char delim); char *format(Pool& pool, double value, char *fmt); @@ -105,10 +164,33 @@ inline int max(int a,int b) { return a>b inline int min(int a,int b){ return a + content-type: text/html + $content-type[$value[text/html] charset[windows-1251]] -> + content-type: text/html; charset=windows-1251 +*/ +const String& attributed_meaning_to_string(Value& meaning, String::Untaint_lang lang); + +#ifdef WIN32 +void back_slashes_to_slashes(char *s); +//void slashes_to_back_slashes(char *s); +#endif + +#ifndef _qsort +# define _qsort(names,cnt,sizeof_names,func_addr) \ + qsort(names,cnt,sizeof_names,func_addr) +#endif + +bool StrEqNc(const char *s1, const char *s2, bool strict=true); -const char *unescape_chars(Pool& pool, const char *cp, int len); +#define SECS_PER_DAY (60*60*24) +int getMonthDays(int year, int month); -const String& attributed_meaning_string(Value *meaning); +void remove_crlf(char *start, char *end); #endif