--- parser3/src/main/pa_common.C 2001/11/05 10:21:27 1.84 +++ parser3/src/main/pa_common.C 2002/02/05 09:32:43 1.97 @@ -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.84 2001/11/05 10:21:27 paf Exp $ + $Id: pa_common.C,v 1.97 2002/02/05 09:32:43 paf Exp $ */ #include "pa_common.h" @@ -16,6 +16,8 @@ #include "pa_hash.h" #include "pa_string.h" +// some maybe-undefined constants + #ifndef _O_TEXT # define _O_TEXT 0 #endif @@ -26,36 +28,97 @@ # define O_TRUNC 0 #endif -#if _MSC_VER +// locking constants -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; +#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 + +#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 + +#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 +// win32 +#ifdef HAVE__LOCKING +static void flock(int fd, int operation) { + lseek(fd, 0, SEEK_SET); + while(_locking(fd, operation, 1)!=0); + lseek(fd, 0, SEEK_SET); } -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; +#else +// sun +#ifdef HAVE_LOCKF +static void flock(int fd, int operation) { + lseek(fd, 0, SEEK_SET); + lockf(fd, operation, 1); + lseek(fd, 0, SEEK_SET); } - +#else +#error unable to find locking func +#endif +#endif #endif -void fix_line_breaks(char *cstr, size_t& size) { - char *dest=cstr; +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=cstr; - while(char *eol=strchr(bol, '\r')) { + 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]=='\n') { // \r,\n = DOS + if(&eol[1]=0 && + (f=open(fname, O_RDONLY|(as_text?_O_TEXT:_O_BINARY)))>=0 && stat(fname, &finfo)==0) { - /*if(exclusive) - flock(f, LOCK_EX);*/ + flock(f, LOCK_SH); size_t max_size=limit?min(offset+limit, finfo.st_size)-offset:finfo.st_size; + int read_size; if(!max_size) { // eof if(as_text) { data=pool.malloc(1); @@ -106,23 +169,23 @@ bool file_read(Pool& pool, const String& lseek(f, offset, SEEK_SET); read_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 + if(read_size<0 || size_t(read_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 - - if(as_text) - fix_line_breaks((char *)data, read_size); + + data_size=read_size; + 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) @@ -142,12 +205,11 @@ static void create_dir_for_file(const St } } -void file_write(Pool& pool, +void file_action_under_lock( const String& file_spec, - const void *data, size_t size, + const char *action_name, void (*action)(int, void *), void *context, bool as_text, - bool do_append/*, - bool exclusive*/) { + bool do_append) { const char *fname=file_spec.cstr(String::UL_FILE_SPEC); int f; if(access(fname, W_OK)!=0) // no @@ -156,22 +218,51 @@ void file_write(Pool& pool, if((f=open(fname, O_CREAT|O_RDWR |(as_text?_O_TEXT:_O_BINARY) - |(do_append?O_APPEND:O_TRUNC), 0666))>=0) { - /*if(exclusive) - flock(f, LOCK_EX);*/ + |(do_append?O_APPEND:O_TRUNC), 0664))>=0) { + flock(f, LOCK_EX); + + try { + action(f, context); + } catch(...) { + flock(f, LOCK_UN); + close(f); + /*re*/throw; + } - if(size) write(f, data, size); -#if O_TRUNC==0 - ftruncate(f, size); -#endif - /*if(exclusive) - flock(f, LOCK_UN);*/ + flock(f, LOCK_UN); close(f); } else throw Exception(0, 0, &file_spec, - "write failed: %s (%d), actual filename '%s'", - strerror(errno), errno, fname); + "%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); +#if O_TRUNC==0 + ftruncate(f, info.size); +#endif +} +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_action_under_lock( + file_spec, + "write", file_write_action, &info, + as_text, + do_append); } // throws nothing! [this is required in file_move & file_delete] @@ -182,17 +273,21 @@ 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) - throw Exception(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); @@ -473,3 +568,54 @@ void remove_crlf(char *start, char *end) case '\r': *p=' '; break; } } + + +/// 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; +}