--- parser3/src/main/pa_common.C 2001/10/08 09:04:08 1.69 +++ parser3/src/main/pa_common.C 2001/11/09 11:06:57 1.86 @@ -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.69 2001/10/08 09:04:08 parser Exp $ + $Id: pa_common.C,v 1.86 2001/11/09 11:06:57 paf Exp $ */ #include "pa_common.h" @@ -16,13 +16,14 @@ #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 +#ifndef _O_TEXT +# define _O_TEXT 0 +#endif +#ifndef _O_BINARY +# define _O_BINARY 0 +#endif +#ifndef O_TRUNC +# define O_TRUNC 0 #endif #if _MSC_VER @@ -42,12 +43,42 @@ int __snprintf(char *b, size_t s, const #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) { + const char * const eob=buf+size; + char *dest=cstr; + // fix DOS: \r\n -> \n + // fix Macintosh: \r -> \n + char *bol=cstr; + 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 + bol=eol+2; + size--; + } else // \r,not \n = Macintosh + bol=eol+1; + } + // last piece without \r, including terminating 0 + if(dest!=bol) + strcpy(dest, bol); +} 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; + 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& read_size, bool as_text, @@ -67,16 +98,20 @@ bool file_read(Pool& pool, const String& // 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 && + (f=open(fname, O_RDONLY|(as_text?_O_BINARY/*_O_TEXT*/:_O_BINARY)))>=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(!max_size) { // eof - data=0; + if(as_text) { + data=pool.malloc(1); + *(char*)data=0; + } else + data=0; read_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); @@ -91,15 +126,17 @@ bool file_read(Pool& pool, const String& if(as_text) ((char*&)data)[read_size]=0; } else - PTHROW(0, 0, + 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); + if(as_text) + fix_line_breaks((char *)data, read_size); + 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); @@ -118,40 +155,33 @@ static void create_dir_for_file(const St void file_write(Pool& pool, const String& file_spec, const void *data, size_t size, - bool as_text/*, + bool as_text, + bool do_append/*, bool exclusive*/) { 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) - 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); + 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);*/ + + if(size) write(f, data, size); +#if O_TRUNC==0 + ftruncate(f, size); #endif - /*if(exclusive) - flock(f, LOCK_UN);*/ - close(f); - return; - } - } - PTHROW(0, 0, - &file_spec, - "write failed: %s (%d), actual filename '%s'", - strerror(errno), errno, fname); + /*if(exclusive) + flock(f, LOCK_UN);*/ + close(f); + } else + throw Exception(0, 0, + &file_spec, + "write failed: %s (%d), actual filename '%s'", + strerror(errno), errno, fname); } // throws nothing! [this is required in file_move & file_delete] @@ -165,7 +195,7 @@ static void rmdir(const String& file_spe void file_delete(Pool& pool, const String& file_spec) { const char *fname=file_spec.cstr(String::UL_FILE_SPEC); if(unlink(fname)!=0) - PTHROW(0, 0, + throw Exception(0, 0, &file_spec, "unlink failed: %s (%d), actual filename '%s'", strerror(errno), errno, fname); @@ -179,7 +209,7 @@ void file_move(Pool& pool, const String& 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 +222,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 +254,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 +310,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 +341,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, @@ -363,14 +393,14 @@ static void append_attribute_subattribut // ...; charset=windows1251 *ami.header << "; "; - ami.header->append(akey, ami.lang, true); + ami.header->append(akey, ami.lang); *ami.header << "="; - ami.header->append(static_cast(avalue)->as_string(), ami.lang, true); + ami.header->append(static_cast(avalue)->as_string(), ami.lang); } 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,44 +452,7 @@ bool StrEqNc(const char *s1, const char } } -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; -} - -static int isLeap(int year) { +static bool isLeap(int year) { return !( (year % 4) || ((year % 400) && !(year % 100)) ); @@ -489,4 +482,4 @@ void remove_crlf(char *start, char *end) case '\n': *p='|'; break; case '\r': *p=' '; break; } -} \ No newline at end of file +}