--- parser3/src/main/pa_common.C 2001/10/08 15:14:07 1.71 +++ parser3/src/main/pa_common.C 2002/02/05 12:09:23 1.98 @@ -2,9 +2,9 @@ Parser: commonly functions. Copyright(c) 2001 ArtLebedev Group(http://www.artlebedev.com) - Author: Alexander Petrosyan (http://design.ru/paf) + Author: Alexander Petrosyan (http://paf.design.ru) - $Id: pa_common.C,v 1.71 2001/10/08 15:14:07 parser Exp $ + $Id: pa_common.C,v 1.98 2002/02/05 12:09:23 paf Exp $ */ #include "pa_common.h" @@ -16,41 +16,143 @@ #include "pa_hash.h" #include "pa_string.h" -#ifndef WIN32 -# ifndef _O_TEXT -# define _O_TEXT 0 +#ifdef WIN32 +# include +#endif + +// some maybe-undefined constants + +#ifndef _O_TEXT +# define _O_TEXT 0 +#endif +#ifndef _O_BINARY +# define _O_BINARY 0 +#endif +#ifndef O_TRUNC +# define O_TRUNC 0 +#endif + +// locking constants + +// win32 +#ifdef _LK_NBLCK +# define TEST_LOCK_EX _LK_NBLCK +#else +// * +# if defined LOCK_EX && defined LOCK_NB +# define TEST_LOCK_EX (LOCK_EX || LOCK_NB) +# else +// sun +# ifdef F_TLOCK +# define TEST_LOCK_EX F_TLOCK +# else +# error unable to define TEST_LOCK_EX +# endif # endif -# ifndef _O_BINARY -# define _O_BINARY 0 +#endif + +#ifndef LOCK_EX +// win32 +# ifdef _LK_LOCK +# define LOCK_EX _LK_LOCK +# else +// sun +# ifdef F_LOCK +# define LOCK_EX F_LOCK +# else +# error unable to define LOCK_EX +# endif # endif #endif -#if _MSC_VER +#ifndef LOCK_SH +// win32 +# ifdef _LK_RLCK +# define LOCK_SH _LK_RLCK +# else +// sun +/// @todo shared lock bit. forgot where to get those F_LOCK consts group +# ifdef F_LOCK +# define LOCK_SH F_LOCK +# else +# error unable to define LOCK_SH +# endif +# endif +#endif -int __vsnprintf(char *b, size_t s, const char *f, va_list l) { - int r=_vsnprintf(b, --s, f, l); - b[s]=0; - return r; -} -int __snprintf(char *b, size_t s, const char *f, ...) { - va_list l; - va_start(l, f); - int r=__vsnprintf(b, s, f, l); - va_end(l); - return r; -} +#ifndef LOCK_UN +// win32 +# ifdef _LK_UNLCK +# define LOCK_UN _LK_UNLCK +# else +// sun +# ifdef F_ULOCK +# define LOCK_UN F_ULOCK +# else +# error unable to define LOCK_UN +# endif +# endif +#endif +#ifndef HAVE_FLOCK +static int flock(int fd, int operation) { + lseek(fd, 0, SEEK_SET); +// win32 +#ifdef HAVE__LOCKING + int result=_locking(fd, operation, 1); +#else +// sun +#ifdef HAVE_LOCKF + int result=lockf(fd, operation, 1); +#else +# error unable to find locking func +#endif #endif + lseek(fd, 0, SEEK_SET); + return result; +} +#endif + +static char *strnchr(char *buf, size_t size, char c) { + for(; size-->0; buf++) { + if(*buf==c) + return buf; + } + + return 0; +} +void fix_line_breaks(char *buf, size_t& size) { + //_asm int 3; + const char * const eob=buf+size; + char *dest=buf; + // fix DOS: \r\n -> \n + // fix Macintosh: \r -> \n + char *bol=buf; + while(char *eol=strnchr(bol, eob -bol, '\r')) { + size_t len=eol-bol; + if(dest!=bol) + memcpy(dest, bol, len); + dest+=len; + *dest++='\n'; + + if(&eol[1]=0 && - stat(fname, &finfo)==0) { - /*if(exclusive) - flock(f, LOCK_EX);*/ - size_t max_size=limit?min(offset+limit, finfo.st_size)-offset:finfo.st_size; + if((f=open(fname, O_RDONLY|(as_text?_O_TEXT:_O_BINARY)))>=0) { + flock(f, LOCK_SH); + if(stat(fname, &finfo)!=0) { + Exception e(0, 0, + &file_spec, + "stat failed: %s (%d), actual filename '%s'", + strerror(errno), errno, fname); + flock(f, LOCK_UN); + close(f); + if(fail_on_read_problem) + throw e; + return false; + } + size_t max_size=limit?min(offset+limit, (size_t)finfo.st_size)-offset:finfo.st_size; if(!max_size) { // eof - data=0; - read_size=0; + if(as_text) { + data=pool.malloc(1); + *(char*)data=0; + } else + data=0; + data_size=0; } else { - data=pool.malloc(max_size+(as_text?1:0)); + data=pool.malloc(max_size+(as_text?1:0), 3); if(offset) lseek(f, offset, SEEK_SET); - read_size=read(f, data, max_size); + data_size=read(f, data, max_size); } - /*if(exclusive) - flock(f, LOCK_UN);*/ + flock(f, LOCK_UN); close(f); if(!max_size) // eof return true; - if(read_size>=0 && read_size<=max_size) { - if(as_text) - ((char*&)data)[read_size]=0; - } else - PTHROW(0, 0, + if(int(data_size)<0 || data_size>max_size) + throw Exception(0, 0, &file_spec, "read failed: actually read %d bytes count not in [0..%lu] valid range", - read_size, (unsigned long)max_size); //never - - return true;//prepare_config(result, remove_empty_lines); + data_size, (unsigned long)max_size); //never + + if(as_text) { + fix_line_breaks((char *)data, data_size); + // note: after fixing + ((char*&)data)[data_size]=0; + } + return true; } if(fail_on_read_problem) - PTHROW(0, 0, + throw Exception(0, 0, &file_spec, "read failed: %s (%d), actual filename '%s'", strerror(errno), errno, fname); @@ -115,43 +230,72 @@ static void create_dir_for_file(const St } } -void file_write(Pool& pool, +bool file_write_action_under_lock( const String& file_spec, - const void *data, size_t size, - bool as_text/*, - bool exclusive*/) { + const char *action_name, void (*action)(int, void *), void *context, + bool as_text, + bool do_append, + bool do_block) { const char *fname=file_spec.cstr(String::UL_FILE_SPEC); int f; - if(access(fname, W_OK)!=0) {/*no*/ + if(access(fname, W_OK)!=0) // no create_dir_for_file(file_spec); - if((f=open(fname, O_WRONLY|O_CREAT|_O_BINARY, 0666))>0) + if((f=open(fname, + O_CREAT|O_RDWR + |(as_text?_O_TEXT:_O_BINARY) + |(do_append?O_APPEND:0), 0664))>=0) { + if(flock(f, do_block?LOCK_EX:TEST_LOCK_EX)!=0) { close(f); - } - if(access(fname, R_OK|W_OK)==0) { - int mode=O_RDWR|(as_text?_O_TEXT:_O_BINARY) -#ifdef WIN32 - |O_TRUNC -#endif - ; - if((f=open(fname, mode, 0666))>=0) { - /*if(exclusive) - flock(f, LOCK_EX);*/ - - if(size) write(f, data, size); -#ifndef WIN32 - ftruncate(f, size); + return false; + } + + try { + action(f, context); + } catch(...) { +#if O_TRUNC==0 + ftruncate(f, tell(f)); #endif - /*if(exclusive) - flock(f, LOCK_UN);*/ + flock(f, LOCK_UN); close(f); - return; + /*re*/throw; } - } - PTHROW(0, 0, - &file_spec, - "write failed: %s (%d), actual filename '%s'", - strerror(errno), errno, fname); + +#if O_TRUNC==0 + ftruncate(f, tell(f)); +#endif + flock(f, LOCK_UN); + close(f); + return true; + } else + throw Exception(0, 0, + &file_spec, + "%s failed: %s (%d), actual filename '%s'", + action_name, strerror(errno), errno, fname); + // here should be nothing, see rethrow above +} + +#ifndef DOXYGEN +struct File_write_action_info { + const void *data; size_t size; +}; +#endif +static void file_write_action(int f, void *context) { + File_write_action_info& info=*static_cast(context); + if(info.size) + write(f, info.data, info.size); +} +void file_write( + const String& file_spec, + const void *data, size_t size, + bool as_text, + bool do_append) { + File_write_action_info info={data, size}; + file_write_action_under_lock( + file_spec, + "write", file_write_action, &info, + as_text, + do_append); } // throws nothing! [this is required in file_move & file_delete] @@ -162,24 +306,28 @@ static void rmdir(const String& file_spe rmdir(file_spec.mid(0, pos_after-1/* / */).cstr(String::UL_FILE_SPEC)); } -void file_delete(Pool& pool, const String& file_spec) { +bool file_delete(const String& file_spec, bool fail_on_read_problem) { const char *fname=file_spec.cstr(String::UL_FILE_SPEC); if(unlink(fname)!=0) - PTHROW(0, 0, - &file_spec, - "unlink failed: %s (%d), actual filename '%s'", - strerror(errno), errno, fname); + if(fail_on_read_problem) + throw Exception(0, 0, + &file_spec, + "unlink failed: %s (%d), actual filename '%s'", + strerror(errno), errno, fname); + else + return false; rmdir(file_spec, 1); + return true; } -void file_move(Pool& pool, const String& old_spec, const String& new_spec) { +void file_move(const String& old_spec, const String& new_spec) { const char *old_spec_cstr=old_spec.cstr(String::UL_FILE_SPEC); const char *new_spec_cstr=new_spec.cstr(String::UL_FILE_SPEC); create_dir_for_file(new_spec); if(rename(old_spec_cstr, new_spec_cstr)!=0) - PTHROW(0, 0, + throw Exception(0, 0, &old_spec, "rename failed: %s (%d), actual filename '%s' to '%s'", strerror(errno), errno, old_spec_cstr, new_spec_cstr); @@ -192,7 +340,7 @@ static bool entry_readable(const String& const char *fname=file_spec.cstr(String::UL_FILE_SPEC); struct stat finfo; if(access(fname, R_OK)==0 && stat(fname, &finfo)==0) { - bool is_dir=(bool)(finfo.st_mode&S_IFDIR); + bool is_dir=finfo.st_mode&S_IFDIR != 0; return is_dir==need_dir; } return false; @@ -224,7 +372,7 @@ bool file_stat(const String& file_spec, struct stat finfo; if(stat(fname, &finfo)!=0) if(fail_on_read_problem) - PTHROW(0, 0, + throw Exception(0, 0, &file_spec, "getting file size failed: %s (%d), real filename '%s'", strerror(errno), errno, fname); @@ -280,7 +428,7 @@ char *rsplit(char *string, char delim) { /// @todo less stupid type detection char *format(Pool& pool, double value, char *fmt) { - char *result=(char *)pool.malloc(MAX_NUMBER); + char *result=(char *)pool.malloc(MAX_NUMBER, 4); if(fmt) if(strpbrk(fmt, "diouxX")) if(strpbrk(fmt, "ouxX")) @@ -311,8 +459,8 @@ size_t stdout_write(const void *buf, siz #endif } -const char *unescape_chars(Pool& pool, const char *cp, int len) { - char *s=(char *)pool.malloc(len + 1); +char *unescape_chars(Pool& pool, const char *cp, int len) { + char *s=(char *)pool.malloc(len + 1, 5); enum EscapeState { EscapeRest, EscapeFirst, @@ -370,7 +518,7 @@ static void append_attribute_subattribut const String& attributed_meaning_to_string(Value& meaning, String::Untaint_lang lang) { String &result=*new(meaning.pool()) String(meaning.pool()); - if(Hash *hash=meaning.get_hash()) { + if(Hash *hash=meaning.get_hash(0)) { // $value(value) $subattribute(subattribute value) if(Value *value=static_cast(hash->get(*value_name))) result.append(value->as_string(), lang, true); @@ -422,7 +570,7 @@ bool StrEqNc(const char *s1, const char } } -static int isLeap(int year) { +static bool isLeap(int year) { return !( (year % 4) || ((year % 400) && !(year % 100)) ); @@ -452,4 +600,69 @@ void remove_crlf(char *start, char *end) case '\n': *p='|'; break; case '\r': *p=' '; break; } -} \ No newline at end of file +} + + +/// must be last in this file +#undef vsnprintf +int __vsnprintf(char *b, size_t s, const char *f, va_list l) { + if(!s) + return 0; + + int r; + // note: on win32& maybe somewhere else + // vsnprintf do not writes terminating 0 in 'buffer full' case, reducing + --s; +#if _MSC_VER + /* + win32: + mk:@MSITStore:C:\Program%20Files\Microsoft%20Visual%20Studio\MSDN\2001APR\1033\vccore.chm::/html/_crt__vsnprintf.2c_._vsnwprintf.htm + + if the number of bytes to write exceeds buffer, then count bytes are written and –1 is returned + */ + r=_vsnprintf(b, s, f, l); + if(r<0) + r=s; +#else + r=vsnprintf(b, s, f, l); + /* + solaris: + man vsnprintf + + The snprintf() function returns the number of characters + formatted, that is, the number of characters that would have + been written to the buffer if it were large enough. If the + value of n is 0 on a call to snprintf(), an unspecified + value less than 1 is returned. + */ + + if(r<0) + r=0; + else if(r>s) + r=s; +#endif + b[r]=0; + return r; +} + +int __snprintf(char *b, size_t s, const char *f, ...) { + va_list l; + va_start(l, f); + int r=__vsnprintf(b, s, f, l); + va_end(l); + return r; +} + +int pa_sleep(unsigned long secs, unsigned long usecs) { + for (; usecs >= 1000000; ++secs, usecs -= 1000000); + +#ifdef WIN32 + Sleep(secs * 1000 + usecs / 1000); + return 0; +#else + struct timeval t; + t.tv_sec = secs; + t.tv_usec = usecs; + return (select(0, NULL, NULL, NULL, &t) == -1 ? errno : 0); +#endif +}