--- parser3/src/include/pa_common.h 2001/03/20 06:45:18 1.18 +++ parser3/src/include/pa_common.h 2001/04/09 11:04:10 1.35 @@ -5,44 +5,47 @@ 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.35 2001/04/09 11:04:10 paf Exp $ */ #ifndef PA_COMMON_H #define PA_COMMON_H -#ifdef HAVE_CONFIG_H -# include "pa_config.h" -#endif - -#ifdef WIN32 -# include -#endif - +#include "pa_config_includes.h" #include -#include + #include "pa_pool.h" +#include "pa_string.h" -class String; +//class String; class Value; -#ifdef WIN32 - -#define open _open -#define close _close -#define read _read -#define stat _stat +#if _MSC_VER -#define vsnprintf __vsnprintf -#define snprintf __snprintf +#ifndef open +# define open _open +#endif +#ifndef close +# define close _close +#endif +#ifndef read +# define read _read +#endif +#ifndef write +# define write _write +#endif +#ifndef stat +# define stat _stat +#endif +#ifndef vsnprintf +# define vsnprintf __vsnprintf int __vsnprintf(char *, size_t, const char *, va_list); +#endif +#ifndef snprintf +# define snprintf __snprintf int __snprintf(char *, size_t, const char *, ...); - -//flock -#define LOCK_EX _LK_NBLCK -#define LOCK_UN _LK_UNLCK -void flock(int fd, int operation); +#endif //access #define F_OK 0 @@ -50,43 +53,56 @@ 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) - -#define putenv _putenv +#ifndef strcasecmp +# define strcasecmp _stricmp +#endif +#ifndef strncasecmp +# define strncasecmp _strnicmp +#endif +#ifndef mkdir +# define mkdir(path, mode) _mkdir(path) +#endif +#ifndef putenv +# define putenv _putenv #endif -/// @todo define it -#ifdef SUN -//flock -#define LOCK_EX F_LOCK -#define LOCK_UN F_ULOCK -void flock(int fd, int operation); #endif -/// @todo use somewhere -void lock(FILE *f, long position); -/// @todo use somewhere -void unlock(FILE *f); +/** + 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); /** 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 exclusive=false*/); + +/** + delete specified file + throws an exception in case of problems +*/ +void file_delete(Pool& pool, const String& file_spec); + +bool file_readable(const String& file_spec); /** scans for @a delim[default \n] in @a *row_ref, @@ -95,7 +111,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 +121,28 @@ 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); #endif