--- parser3/src/main/pa_common.C 2001/03/20 17:52:39 1.19.2.2 +++ parser3/src/main/pa_common.C 2001/04/03 17:01:03 1.39 @@ -1,3 +1,4 @@ + /** @file Parser: commonly functions. @@ -5,19 +6,16 @@ Author: Alexander Petrosyan (http://design.ru/paf) - $Id: pa_common.C,v 1.19.2.2 2001/03/20 17:52:39 paf Exp $ + $Id: pa_common.C,v 1.39 2001/04/03 17:01:03 paf Exp $ */ -#ifdef HAVE_CONFIG_H -# include "pa_config.h" -#endif +#include "pa_config_includes.h" #include -#include #include #include #include -#include +#include #include "pa_common.h" #include "pa_types.h" @@ -28,7 +26,7 @@ #include "pa_hash.h" #include "pa_string.h" -#ifdef WIN32 +#if _MSC_VER int __vsnprintf(char *b, size_t s, const char *f, va_list l) { int r=_vsnprintf(b, --s, f, l); @@ -46,106 +44,102 @@ int __snprintf(char *b, size_t s, const #endif -#ifdef WIN32 - -void flock(int fd, int operation) { - lseek(fd, 0, SEEK_SET); - while(_locking(fd, operation, 1)!=0); - lseek(fd, 0, SEEK_SET); -} - -#endif - -/// @todo define it -//\#ifdef SUN -#ifndef WIN32 - -void flock(int fd, int operation) { - lseek(fd, 0, SEEK_SET); - lockf(fd, operation, 1); - lseek(fd, 0, SEEK_SET); -} -#endif - -void lock(FILE *f, long position) { - flock(fileno(f), LOCK_EX); -} -void unlock(FILE *f) { - flock(fileno(f), LOCK_UN); -} - - -char *file_read_text(Pool& pool, const char *fname, bool fail_on_read_problem) { - int f; +char *file_read_text(Pool& pool, const String& file_spec, bool fail_on_read_problem) { + void *result; + size_t size; + return file_read(pool, file_spec, result, size, true, + fail_on_read_problem)?(char *)result:0; +} +bool file_read(Pool& pool, const String& file_spec, + void*& data, size_t& size, bool as_text, + bool fail_on_read_problem) { + char *fname=file_spec.cstr(String::UL_FILE_NAME); + int f; struct stat finfo; - if(fname && !stat(fname,&finfo) &&(f=open(fname,O_RDONLY -#ifdef WIN32 - |O_TEXT -#endif - ))>=0) { + + // first open, next stat: + // directory update of NTFS symbolic links performed on open. + // ex: + // a.html:^test[] and b.html hardlink to a.html + // user inserts ! before ^test in a.html + // directory entry of b.html in NTFS not updated at once, + // they delay update till open, so we would receive "!^test[" string + // if would do stat, next open. + if( + (f=open(fname, O_RDONLY|(as_text?_O_TEXT:_O_BINARY)))>=0 && + stat(fname, &finfo)==0) { /*if(exclusive) flock(f, LOCK_EX);*/ - - char *result=(char *)pool.malloc(finfo.st_size+1); - int read_size=read(f,result,finfo.st_size); - if(read_size>=0 && read_size<=finfo.st_size) - result[read_size]='\0'; + data=pool.malloc(finfo.st_size+(as_text?1:0)); + size=read(f, data, finfo.st_size); /*if(exclusive) flock(f, LOCK_UN);*/ close(f); - return result;//prepare_config(result, remove_empty_lines); + + if(size>=0 && size<=(size_t)finfo.st_size) { + if(as_text) + ((char *)data)[size]=0; + } else + PTHROW(0, 0, + &file_spec, + "read failed: actually read %d bytes count not in [0..%ul] valid range", + size, (unsigned long)finfo.st_size); //never + + return true;//prepare_config(result, remove_empty_lines); } if(fail_on_read_problem) - PTHROW(0,0, - 0, - "use: can not read '%s' file", fname); - return 0; + PTHROW(0, 0, + &file_spec, + "read failed: %s (#%d)", strerror(errno), errno); + return false; } +/// @test mkdirs void file_write(Pool& pool, - const char *fname, - const char *data, size_t size, - bool as_text, - bool exclusive) { - if(fname) { - int f; - if(access(fname, F_OK)!=0) {/*no*/ - if((f=open(fname,O_WRONLY|O_CREAT|_O_BINARY,0666))>0) - close(f); - } - if(access(fname, R_OK|W_OK)==0) { - int mode=O_RDWR -#ifdef WIN32 - |O_TRUNC -#endif - ; + const String& file_spec, + const void *data, size_t size, + bool as_text/*, + bool exclusive*/) { + char *fname=file_spec.cstr(String::UL_FILE_NAME); + int f; + if(access(fname, F_OK)!=0) {/*no*/ + if((f=open(fname, O_WRONLY|O_CREAT|_O_BINARY, 0666))>0) + close(f); + } + if(access(fname, R_OK|W_OK)==0) { + int mode=O_RDWR|(as_text?_O_TEXT:_O_BINARY) #ifdef WIN32 - mode|=as_text?_O_TEXT:_O_BINARY; + |O_TRUNC #endif - if((f=open(fname,mode,0666))>=0) { - if(exclusive) - flock(f, LOCK_EX); - - if(size) write(f,data,size); + ; + if((f=open(fname, mode, 0666))>=0) { + /*if(exclusive) + flock(f, LOCK_EX);*/ + + if(size) write(f, data, size); #ifndef WIN32 - ftruncate(f,size); + ftruncate(f, size); #endif - if(exclusive) - flock(f, LOCK_UN); - close(f); - return; - } + /*if(exclusive) + flock(f, LOCK_UN);*/ + close(f); + return; } } - if(fname) - PTHROW(0, 0, - 0, - "file_write('%s'): %s (#%d)", - fname, strerror(errno), errno); - else - PTHROW(0, 0, - 0, - "file_write: no filename specified"); + PTHROW(0, 0, + &file_spec, + "write failed: %s (#%d)", strerror(errno), errno); +} + +void file_delete(Pool& pool, const String& file_spec) { + if(unlink(file_spec.cstr(String::UL_FILE_NAME))!=0) + PTHROW(0, 0, + &file_spec, + "unlink failed: %s (#%d)", strerror(errno), errno); +} + +bool file_readable(const String& file_spec) { + return access(file_spec.cstr(String::UL_FILE_NAME), R_OK)==0; } char *getrow(char **row_ref, char delim) { @@ -160,9 +154,9 @@ char *getrow(char **row_ref, char delim) return result; } -char *lsplit(char *string_ref, char delim) { - if(string_ref) { - char *v=strchr(string_ref, delim); +char *lsplit(char *string, char delim) { + if(string) { + char *v=strchr(string, delim); if(v) { *v=0; return v+1; @@ -189,30 +183,31 @@ char *rsplit(char *string, char delim) { return NULL; } +/// @todo less stupid type detection char *format(Pool& pool, double value, char *fmt) { char *result=(char *)pool.malloc(MAX_NUMBER); if(fmt) if(strpbrk(fmt, "diouxX")) if(strpbrk(fmt, "ouxX")) - snprintf(result, MAX_NUMBER, fmt,(uint)value ); + snprintf(result, MAX_NUMBER, fmt, (uint)value ); else - snprintf(result, MAX_NUMBER, fmt,(int)value ); + snprintf(result, MAX_NUMBER, fmt, (int)value ); else snprintf(result, MAX_NUMBER, fmt, value); else - snprintf(result, MAX_NUMBER, "%d",(int)value); + snprintf(result, MAX_NUMBER, "%d", (int)value); return result; } -size_t stdout_write(const char *buf, size_t size) { +size_t stdout_write(const void *buf, size_t size) { #ifdef WIN32 do{ int chunk_written=fwrite(buf, 1, min(8*0x400, size), stdout); if(chunk_written<=0) break; size-=chunk_written; - buf+=chunk_written; + buf=((const char*)buf)+chunk_written; } while(size>0); return size; @@ -224,8 +219,8 @@ size_t stdout_write(const char *buf, siz const char *unescape_chars(Pool& pool, const char *cp, int len) { char *s=(char *)pool.malloc(len + 1); enum EscapeState { - EscapeRest, - EscapeFirst, + EscapeRest, + EscapeFirst, EscapeSecond } escapeState=EscapeRest; int escapedValue=0; @@ -266,22 +261,32 @@ static void append_attribute_subattribut // ...; charset=windows1251 String *string=static_cast(info); - string->APPEND_CONST("; "); + if(string->size()) + string->APPEND_CONST("; "); string->append(akey, String::UL_HEADER, true); string->APPEND_CONST("="); string->append(static_cast(avalue)->as_string(), String::UL_HEADER, true); } -const String& attributed_meaning_string(Value *meaning) { - String &result=*new(meaning->pool()) String(meaning->pool()); - if(Hash *hash=meaning->get_hash()) { +const String& attributed_meaning_to_string(Value& meaning) { + String &result=*new(meaning.pool()) String(meaning.pool()); + if(Hash *hash=meaning.get_hash()) { // $value(value) $subattribute(subattribute value) if(Value *value=static_cast(hash->get(*value_name))) result.append(value->as_string(), String::UL_HEADER, true); - hash->foreach(append_attribute_subattribute, &result); + hash->for_each(append_attribute_subattribute, &result); } else // result value - result.append(meaning->as_string(), String::UL_HEADER, true); + result.append(meaning.as_string(), String::UL_HEADER, true); return result; -} \ No newline at end of file +} + +#ifdef WIN32 +void back_slashes_to_slashes(char *s) { + if(s) + for(; *s; s++) + if(*s=='\\') + *s='/'; +} +#endif