--- parser3/src/main/pa_common.C 2001/04/09 09:48:20 1.41 +++ parser3/src/main/pa_common.C 2001/04/19 15:38:00 1.48 @@ -1,4 +1,3 @@ - /** @file Parser: commonly functions. @@ -6,18 +5,10 @@ Author: Alexander Petrosyan (http://design.ru/paf) - $Id: pa_common.C,v 1.41 2001/04/09 09:48:20 paf Exp $ + $Id: pa_common.C,v 1.48 2001/04/19 15:38:00 paf Exp $ */ #include "pa_config_includes.h" - -#include -#include -#include -#include -#include -#include - #include "pa_common.h" #include "pa_types.h" #include "pa_exception.h" @@ -27,6 +18,15 @@ #include "pa_hash.h" #include "pa_string.h" +#ifndef WIN32 +# ifndef _O_TEXT +# define _O_TEXT 0 +# endif +# ifndef _O_BINARY +# define _O_BINARY 0 +# endif +#endif + #if _MSC_VER int __vsnprintf(char *b, size_t s, const char *f, va_list l) { @@ -52,14 +52,15 @@ char *file_read_text(Pool& pool, const S 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); + void*& data, size_t& read_size, bool as_text, + bool fail_on_read_problem, + size_t offset, size_t limit) { + const char *fname=file_spec.cstr(String::UL_FILE_NAME); int f; struct stat finfo; // first open, next stat: - // directory update of NTFS symbolic links performed on open. + // directory update of NTFS hard links performed on open. // ex: // a.html:^test[] and b.html hardlink to a.html // user inserts ! before ^test in a.html @@ -71,27 +72,35 @@ bool file_read(Pool& pool, const String& stat(fname, &finfo)==0) { /*if(exclusive) flock(f, LOCK_EX);*/ - data=pool.malloc(finfo.st_size+(as_text?1:0)); - size=read(f, data, finfo.st_size); + size_t max_size=limit?min(offset+limit, finfo.st_size)-offset:finfo.st_size; + if(!max_size) { // eof + data=0; + read_size=0; + return true; + } + data=pool.malloc(max_size+(as_text?1:0)); + if(offset) + lseek(f, offset, SEEK_SET); + read_size=read(f, data, max_size); /*if(exclusive) flock(f, LOCK_UN);*/ close(f); - if(size>=0 && size<=(size_t)finfo.st_size) { + if(read_size>=0 && read_size<=max_size) { if(as_text) - ((char *)data)[size]=0; + ((char*&)data)[read_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 + "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); } if(fail_on_read_problem) PTHROW(0, 0, &file_spec, - "read failed: %s (#%d)", strerror(errno), errno); + "read failed: %s (%d)", strerror(errno), errno); return false; } @@ -101,7 +110,7 @@ void file_write(Pool& pool, const void *data, size_t size, bool as_text/*, bool exclusive*/) { - char *fname=file_spec.cstr(String::UL_FILE_NAME); + const 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) @@ -129,19 +138,33 @@ void file_write(Pool& pool, } PTHROW(0, 0, &file_spec, - "write failed: %s (#%d)", strerror(errno), errno); + "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); + "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; } +bool file_executable(const String& file_spec) { + return access(file_spec.cstr(String::UL_FILE_NAME), X_OK)==0; +} + +size_t file_size(const String& file_spec) { + Pool& pool=file_spec.pool(); + const char *fname=file_spec.cstr(String::UL_FILE_NAME); + struct stat finfo; + if(stat(fname, &finfo)!=0) + PTHROW(0, 0, + &file_spec, + "write failed: %s (%d)", strerror(errno), errno); + return finfo.st_size; +} char *getrow(char **row_ref, char delim) { char *result=*row_ref; @@ -267,12 +290,10 @@ static void append_attribute_subattribut Attributed_meaning_info& ami=*static_cast(info); // ...; charset=windows1251 - if(ami.header->size()) - ami.header->APPEND_CONST("; "); + *ami.header << "; "; ami.header->append(akey, ami.lang, true); - ami.header->APPEND_CONST("="); - ami.header->append(static_cast(avalue)->as_string(), - ami.lang, true); + *ami.header << "="; + ami.header->append(static_cast(avalue)->as_string(), ami.lang, true); } const String& attributed_meaning_to_string(Value& meaning, String::Untaint_lang lang) { String &result=*new(meaning.pool()) String(meaning.pool()); @@ -299,6 +320,14 @@ void back_slashes_to_slashes(char *s) { if(*s=='\\') *s='/'; } +/* +void slashes_to_back_slashes(char *s) { + if(s) + for(; *s; s++) + if(*s=='/') + *s='\\'; +} +*/ #endif bool StrEqNc(const char *s1, const char *s2, bool strict) { @@ -319,3 +348,40 @@ bool StrEqNc(const char *s1, const char s2++; } } + +char *unquote(char*& current, char stop_at) { + char *result=current; + char *dest=current; + // skip leading WS + while(*current==' ' || *current=='\t') + current++; + if(!*current) + return current=0; + + bool quoted=*current=='"'; + if(quoted) + current++; + + for(; *current; ) { + if(quoted) + switch(*current) { + case '\\': // "...\c + if(current[1]) + current++; + break; + case '"': + current++; + goto break2; + } + else + if(*current==stop_at) + break; + + *dest++=*current++; + } +break2: + if(*current) + current++; // skip 'stop_at' + *dest=0; + return result; +}